Skip to content

Improve displayed instructions for local merge conflicts

Issue

When users encounter a merge conflict that much be resolve locally, GitLab displays a Merge locally button by the message, which upon clicking displays a pop-up with this information:

Screen_Shot_2021-12-03_at_3.40.05_PM

In actuality, it should provide information to the user that's based on the process described at: https://docs.gitlab.com/ee/user/project/merge_requests/conflicts.html#resolve-conflicts-from-the-command-line