Option to hide "Resolve conflicts" button

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

• Close this issue

If a merge request has conflicts, a "Resolve conflicts" button appears:

        

When you click it, GitLab offers to merge the target branch into the topic branch:

        

I really don't want users to merge the target branch into the topic branch. In the projects I work on, topic branches should almost always be rebased onto the target branch. Having an attractive button that does a merge instead encourages contributors to go against the project's preferred workflow.

In the project settings, there are some related options, but nothing to control the conflict resolution interface:

        

Ideally there would be an option to do conflict resolution in GitLab via rebase instead of merge. That would be a big feature to add though, so how about just adding an "Enable in-browser conflict resolution" checkbox that I can uncheck to hide the button?