“Resolve these conflicts” link is too subtle
For such a useful feature we should not be hiding it behind an inconspicuous link:
Turn the links into a more obvious button group with two buttons: Resolve conflicts and Merge locally.
Since we have the merge conflict editor, be sure to label the button “Merge locally” instead of “Merge manually”.
Resolve Conflicts only
Description line: “To merge this request, resolve these conflicts or ask someone with write access to this repository to merge it locally”
Resolve Conflicts and Merge Locally
Description line: “To merge this request, resolve these conflicts or merge it locally”