To solve without the web UI, you need to use the local tools: command line or git client.

1. Conflict on PR :

firststep.png810×590 45.1 KB

2. Locally try to merge “branchConflict” to “master” with the merge command (you need to stay in the branch you want to merge):

   git merge branchConflict master

(you can do this merge even with a git client like: github desktop or gitkraken) If there are conflicts the output will be something like this:

Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.

In my case there are only one conflict (in README.md), if there are more than one conflict the output will be more large. This command will create the same lines of the “Resolve conflicts” in github, something like this:

# test
<<<<<<< HEAD

This line will create a new conflict
I try to create conflicts
Hope this can help someone

>>>>>>> master

You can now edit the files where this lines are. Remember that :

• <<<<<<< HEAD indicates the start of the conflict of the actual branch in my case branchConflict ;
• this ======= is the line to separate branchConflict body with master body (in this case);
• than will be _ >>>>>>> master   _this line indicates the end of the conflict with the master branch.

NB: in the same file can be more of this lines of conflicts something like this:

_\<\<\<\<\<\<\< HEAD conflictBranch 1 ======= master 1 \>\>\>\>\>\>\> master_<u><strong>lines not in conflict</strong></u>_\<\<\<\<\<\<\< HEAD conflictBranch 2 ======= master 2 \>\>\>\>\>\>\> master_<u><strong>lines not in conflict</strong></u>_\<\<\<\<\<\<\< HEAD conflictBranch 3 ======= master 3 \>\>\>\>\>\>\> master_<u><strong>and so on...</strong></u>

3. Solve the conflict in the same way you can do with web UI, in my case I done this:

   test

   This line will create a new conflict

   I try to create conflicts

   Hope this can help someone

(simply delete the indicators).

4. Add, commit and push this changes and you will find a green button of “Merge pull request”:

secondyolo.png790×603 49.8 KB

Ask if you have more problems with conflicts 🙂

-Gabriele-

Mark helpful posts with Accept as Solution to help other users locate important info. Don’t forget to give Kudos for great content!