Skip to content

Instantly share code, notes, and snippets.

@likidu

likidu/git-list-merge-conflict-files.md

Created July 24, 2015 08:17
Show Gist options
  • Save likidu/d7bb2478e3200babb2d9 to your computer and use it in GitHub Desktop.
Save likidu/d7bb2478e3200babb2d9 to your computer and use it in GitHub Desktop.
Download ZIP
Git list merge conflict files
Raw
git-list-merge-conflict-files.md

For a simple list

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

For all conflict places in a list

git ls-files -u

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment