Generate the merge commit message for Merge Requests with conflicts too
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:
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:
git merge --no-ff fix/tutorial-animationsin Step 3.