Skip to content

Update GitLab merge/rebase messages to reflect Marge workflow

Currently, we use @marge-bot to handle merging of patches to master. However, GitLab's MR guidance gives the very misleading impression that the user should use the "merge" button and is responsible for rebasing. We should patch these messages to avoid this confusion.

See also: !10004 (comment 484384)

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information