We can use mergetool to solve conflicts in git.
Here is short (a very short) example. Original post is here.
$ git mergetool
Both of you have modified planets.md. When you open the file in your text editor, you’ll see both changes:
the number of planets are <<<<<<< HEAD nine ======= eight >>>>>>> branch-a
branch-a, you wrote the word “nine,” but your friend wrote “eight.” Git automatically addsconflict markers to the affected areas. A conflict-marked area begins with
<<<<<<< and ends with
>>>>>>>. These are also known as the conflict markers. The two conflicting blocks themselves are divided by a