automatic merge failed fix conflicts and then commit the result. git bash code example Example: git find merge conflicts git diff --name-only --diff-filter=U