correct way to merge branches with conflicts code example

Example: git find merge conflicts

git diff --name-only --diff-filter=U