git auto merge all conflicts code example
Example 1: git find merge conflicts
git diff --name-only --diff-filter=U
Example 2: git Automatic merge failed; fix conflicts and then commit the result
$ git status
$ git add .
$ git commit -a "Comment"