git both modified resolve code example

Example 1: show conflicts git

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"