Merging a local branch with the master - resolving conflicts

Question

I am trying to merge a local branch with the master and there were some conflicts. I resolved the conflicts, however, I cannot commit the changes. The error that I get is - fatal: Exiting because of an unresolved conflict.

How can I check existing conflicts and resolve them?

Thanks in advance.

Answer 1

You can write git status to reveal what files that need's to be changed. Be sure to correct and add those files to your commit.

You can also check out some guides for how to merge correctly as mentioned above on these links: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging And the mergetool: http://git-scm.com/docs/git-mergetool