Quick summary
Resolving merge conflicts in GitLab can be done entirely through the browser using the built-in conflict resolution tool. This guide walks you through navigating to a merge request, choosing which code version to keep, and completing the merge without leaving GitLab.
Steps
- Log in to your GitLab account, navigate to your project, and select Merge requests.
- Open the merge request that has conflicts and click Resolve conflicts.
- For each conflicting file, select Use ours or Use theirs to choose which version of the code to keep.
- Click Commit to source branch to save your conflict resolution choices.
- Review any remaining fields as needed, then click Merge to complete the merge request.
