how to fix merge conflicts in git bash code example Example: show conflicts git git diff --name-only --diff-filter=U