5wajqq
Last Updated: February 25, 2016
·
1.955K
· dayjo

Display list of files containing conflicts in Git

Usually I just use the output from the merge command, but sometimes if there's a lot of changes, it can be difficult to see or they disappear out of the scope of the terminal window.

Run this command to list the files with conflicts in;

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