git check for conflicts code example Example: show conflcited files git diff --name-only --diff-filter=U