how to see merge conflicts with master code example Example: git find merge conflicts git diff --name-only --diff-filter=U