Override merge method at the merge request level

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

• Close this issue

Description

• GitLab supports three merge methods for merge requests, and this is configured at the project level, in the project settings:

• But sometimes users/teams would like to override that setting at a particular merge request, but retain the setting for merge requests in general.
• We should allow that.
• Probably project maintainers should decide the merge method, because it ultimately impacts the git history of the project.
• So the overriding choice should be limited to project maintainers, and should probably be determined when the merge action is taken.
• But it's not clear how the design should work. We have MWPS, and that already occupies the button selection, as mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/42767#note_57635894. How do create another choice in the design?

Original description

The different merge strategies should be available to pick for each merge request, instead of just one global setting that applies to all merge requests.

This is how GitHub does it:

It gives more flexibility. For example a team may want to use rebase fast-forward only for simple one commit bug fix, but use normal merge for merging in a feature branch.