git merge fix conflict code example Example: git Automatic merge failed; fix conflicts and then commit the result $ git status $ git add . $ git commit -a "Comment"