how to display conflicts in github merge code example Example: git find merge conflicts git diff --name-only --diff-filter=U