Git Merge Command

Git commands when merge conflicts happened.

We can abort merging with the following command

$ git merge --abort

Resolving merge conflict with merge tool

$ git mergetool

Adding all changes after resolving merge conflicts with merge tool.

$ git add -A

With the following command, we can finish the merge conflict.

$ git merge --continue