Allow maintainers/developers to resolve merge conflicts in the web UI from a protected branch if defined in settings.

Problem to solve

As a maintainer, I want to be able to resolve a merge conflict in the web UI for a protected branch so that I can quickly resolve minor conflicts.

It has been bothering us a lot to go through the entire CLI process if it's only a minor conflict that could be resolved in a couple of seconds over the web UI.

Intended users

• Developers
• Maintainers

Proposal

Add a third column in the protected branch settings:

The naming of the column could be optimized.