git fix merge conflicts locallly code example Example: git find merge conflicts git diff --name-only --diff-filter=U