how to get rid of merge conflicts git code example Example: show conflicts git git diff --name-only --diff-filter=U