List Conflicted Git Files

Find conflicted files with git diff

You can use this command to the conflicted files in a bad git merge.

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

Create an alias for the command

You can also create a global alias for this command as follows.

git config --global alias.conflicts "diff --name-only --diff-filter=U"

The alias is called like this:

git conflicts

References

• What's the simplest way to git a list of conflicted files?