Resolve Conflicts in Code on the Web during a GitLab MR

      This file only relates to  GitLab.
    

The following guide shows you how to resolve conflicts directly from the Merge Request if found

1. Click the "Resolve Conflicts" button if it appears during a MR
   
2. GitLab will show you the files that are currently conflicting. From there you have 2 modes you can use:
   • Interactive Mode
     This mode will allow you look at the conflict and select either one of them to use as conflict resolution
     
   • Manual Inline Mode
     This mode will allow you to manually modify and resolve the conflict directly from the page itself
     Note: In this mode, you need to remove the 3 lines (<<<, >>> and ===) or errors may occur
     
3. After resolving the conflict using either of the modes, enter your Commit Message for the conflict resolution and click "Commit"
   
4. Ensure that your conflict has been resolved (Button shows "Merge" or "Merge when pipeline succeeds")