When creating a Merge Request and Gitlab states There are merge conflicts
, under the section You can merge this merge request manually using the command line
it states Tip: You can also checkout merge requests locally by following these guidelines.
Once you have followed those guidelines and checked out the MR
how do you go about resolving the conflict as in the detached HEAD
state you end up in there is no indication of conflicts?