git how to show merge conflicts with remote branch code example Example: git find merge conflicts git diff --name-only --diff-filter=U