how to see the conflict in git code example Example: show conflicts git git diff --name-only --diff-filter=U