<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=25003) </details> <!--IssueSummary end--> Resolving conflicts in the GitLab interface is very useful, but exactly what this feature is doing is not immediately obvious. In some situations like a merge request from a `master` into a `release` branch, it would be much better to just resolve the conflicts manually. Additionally, a number of users have reported that the merge commit is in the incorrect direction because they assumed that what was happening was manually creating the merge commit into the target branch. We should add clearer warnings/explanations of what the feature does in the application. ### Further details The resolve conflict interface is currently quite strange because it shows the merge request description and title above the files in conflict without showing a clear title that this is a conflict resolution interface. Additionally the instructions for choosing **Ours** or **Theirs** is at the bottom below the interface where the user actually makes the suggestions. | Merge request with conflict | Resolve conflict interface | | --- | --- | |  |  | ### Proposal The interface should clearly state that: the merge request is merging `source-branch` into the `target-branch` and that the resolve conflict interface will merge `target-branch` into `source-branch` to resolve the conflicts, allowing the `source-branch` to be merged into the `target-branch`. ``` X---Z source / / \ A---B---C---o target ``` The interface should clearly warn that this interface **does not** manually create a merge commit and merge the `source-branch` into the `target-branch`. ### Links / references