How to resolve merge conflicts in gitlab
- George Apostolov
How to resolve merge conflicts in gitlab: step-by-step guide
Log in to your GitLab account and navigate and select "Merge requests."
As you can see in this merge request there are conflicts. Click on "Resolve this conflicts."
Select "Use ours" or "Use theirs," depending on which version you want to keep for resolving the merge conflict.
Click "Commit to source branch."
Review the other fields as needed. When ready, click "Merge" to complete the merge request.
Quick answer: To resolve merge conflicts in GitLab, navigate to your merge requests, click resolve conflicts, and select either to use ours or theirs. Next, commit to the source branch, review any additional fields as needed, and finally click merge to complete the request.
About this GitLab tutorial
Resolve merge conflicts in GitLab easily by choosing between changes, committing to the source branch, and completing the merge request. This guide shows how to resolve merge conflicts in gitlab in 5 steps, starting with "Log in to your GitLab account and navigate and select 'Merge requests'" and finishing with "Review the other fields as needed. When ready, click 'Merge' to complete the merge request". The interactive demo above is a click-through copy of the real GitLab interface, so you can rehearse each step before doing it in your own account.
Frequently asked questions
How many steps does it take to resolve merge conflicts in gitlab?
5 steps. Each one is listed in order above, and the demo highlights exactly where to click.
Can I try it without changing my own account?
Yes. Clicking through the demo doesn't touch your GitLab data or settings. Once you know the flow, repeat it in your own workspace.
This tutorial is filed under GitLab. Related guides: How to setup gitlab, How to Sync GitLab Snippet Comments to Slack Using Zapier and How to update gitlab. Last reviewed 05 Oct 2026.
Create your first interactive demo in minutes
No credit card required • Start building today
