How to resolve merge conflicts in gitlab

Guide

1. Log in to your GitLab account and navigate and select "Merge requests."

2. As you can see in this merge request there are conflicts. Click on "Resolve this conflicts."

3. Select "Use ours" or "Use theirs," depending on which version you want to keep for resolving the merge conflict.

4. Click "Commit to source branch."

5. Review the other fields as needed. When ready, click "Merge" to complete the merge request.