Git - Resolve Merge conflicts

When you pull changes from the Git server you might get conflict in your code. So we will see how to resolve those conflicts.

You can use git mergetool to check the conflicts. This is the merge conflict resolution tools to resolve merge conflicts.

Additionally you can resolve conflicts in your file by running below commands.

git checkout --ours <your File name> 
git checkout --theirs <your File name> 
git add <your File name> 
git commit -m "Conflicts Resolve"

And then pull the changes with

git pull origin master

You will see the message similar to below

From ssh://[git URL]/projectname

 * branch            master     -> FETCH_HEAD

Already up-to-date