Git merging the conflicts through command line

To merge the conflict I had to do the following steps

1.Swithcing to the mother branch

 git checkout mother_branch_name

mother_branch -> to which I have to merge my child branch

2.Merging the child branch to mother branch

 git merge child_branch_name

Now it'll notify the conflicting files

3.Opening the merge tool

 git mergetool --tool=emerge

There are 17 different merge tools out of that I prefer emerge as its easy

Here are some of the keys to operate emerge tool

N- next
P- previous
A- choose the mother branch change
B- choose the child branch change
Q - Quit and save the changes

As soon as the screen appears ,Press N to see the conflict .. then use P and N to navigate across the conflicts

choose A and B on each conflict

Once you are done press Q to save or discard the modifications you did

To know more about the emerge tool.click here