Make explicit that merge conflict feature commits to source branch
Description
- As shown in this issue (https://gitlab.com/gitlab-org/gitlab-ce/issues/21947), the merge conflict feature is causing some people to mistakenly think that the merge conflicts resolution commit is being applied to the target branch.
- Since on the command line, the merge conflict resolution feature in git allows you to resolve the conflict and apply the changes to the target branch as a merge, people mistakenly think this GitLab feature in the UI is doing the same thing.
- This is not the intention of the feature. The intention of the feature is to ensure that the source branch is no longer in conflict with the target branch. And that the merge request can continued to be worked on if desired.
- In the future, we should work on other features to address the user needs and their expectations. But for now, we should start with eliminating confusing and make it explicit changes are applied to the source branch.
- This issue making some changes to the UI to make it obvious.
Design - Conflicts Page
Copy:
You can resolve the merge conflict using either the Interactive mode, by choosing `Use Ours` or `Use Theirs` buttons, or by editing the files directly. Commit these changes into test-branch.
The Sketch file for this design can be found here.
Edited by Jeethu Karthik