Disable resolve conflicts button if the merge request source branch is protected

Resolving conflicts in the GitLab interface is very useful, but exactly what this feature is doing is not immediately obvious, and in some situations is absolutely not the way to resolve conflicts. Specifically if a merge request is merging changes from master (default branch) into a release-* branch, the resolve conflicts interface would offer to merge release-* into master which is not the correct approach.

Proposal

Disable the Resolve conflicts button and show a tooltip explaining why the option is disabled

Design

• Learn more link (use appropriate link for CE/EE) - https://docs.gitlab.com/ce/user/project/merge_requests/resolve_conflicts.html
• Popovers documentation
• Design specs

Copy:

This feature merges changes from the target branch to the source branch. You cannot use this feature since the source branch is protected.

Links / references