Git-Workshop

04-Resolving Merge Conflicts

1 min read

As you are now in the conflict stage, when you open conflicted files, you would see something like this,

Friends
The Sopranos
Breaking Bad
I Love Lucy
<<<<<<< HEAD
The Wire
=======
Game of Thrones
>>>>>>> update_classics

Note

<<<<<<< HEAD - Contents of the current branch ======= - Conflict Separator >>>>>>> update_classics - Contents of the branch that’s being merged

  1. Modify the conflicted file(classics.md), without any of the conflict parameters. Accept the incoming changes

Your final file should be like this,

Friends 
The Sopranos 
Breaking Bad 
I Love Lucy
Game of Thrones
  1. After resolving the conflict, stage the changes and continue the merge
git add .
git merge --continue

Make the commit message starting with "H: "

  1. Delete the update_classics branch
git branch -d upadte_classics