### Problem to solve If someone creates a MR which conflicts with the target branch, you have to merge it locally. But doing so, you have to manually create the commit message (that includes the MR slug, for example) to have the same format as the ones created from gitlab.com. ### Intended users Developers. ### Further details The goal is to simplify the manually merging of MRs flow. ### Proposal When a MR has conflicts with the target branch, the popup opened by the "Merge locally" button could simply contain: ```sh git merge --no-ff fix/tutorial-animations -m "Merge branch '<mr-branch>' into '<target-branch>'\n\n<mr-title>\n\nSee merge request <mr-slug>" ``` instead of: ```sh git merge --no-ff fix/tutorial-animations ``` in **Step 3**. ### Permissions and Security <!-- What permissions are required to perform the described actions? Are they consistent with the existing permissions as documented for users, groups, and projects as appropriate? Is the proposed behavior consistent between the UI, API, and other access methods (e.g. email replies)? --> ### Documentation <!-- See the Feature Change Documentation Workflow https://docs.gitlab.com/ee/development/documentation/feature-change-workflow.html Add all known Documentation Requirements here, per https://docs.gitlab.com/ee/development/documentation/feature-change-workflow.html#documentation-requirements --> ### Testing <!-- What risks does this change pose? How might it affect the quality of the product? What additional test coverage or changes to tests will be needed? Will it require cross-browser testing? See the test engineering process for further guidelines: https://about.gitlab.com/handbook/engineering/quality/guidelines/test-engineering/ --> ### What does success look like, and how can we measure that? <!-- Define both the success metrics and acceptance criteria. Note that success metrics indicate the desired business outcomes, while acceptance criteria indicate when the solution is working correctly. If there is no way to measure success, link to an issue that will implement a way to measure this. --> ### Links / references