Merge method: Allow multiple merge methods in each repo, and have multiple merge buttons in MRs
Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.
Problem to solve
In some repositories, people might want to alternate between merge options like using a merge commit and using a FF merge, with squash or not. The problem is that the current settings only allow one method to be used.
Intended users
This is intended, mostly, for Software Developers, but it might interest any other user that pushes commits to git repositories.
Proposal
I think the radio buttons for the merge options should be replaced with checkboxes, like GitHub does (see image below). Naturally, the internal data structure representing of the selected options would have to be adjusted accordingly.
The second necessary change is to adapt the Merge
button in case more than one merge option is allowed. Again, for inspiration, here's how GitHub does it: