git pul Automatic merge failed; fix conflicts and then commit the result code example

git diff --name-only --diff-filter=U