an0j4w
Last Updated: February 25, 2016
·
544
· jacaetevha
D21ebccf20562e370eb0a8cf170a0580

Git: Show Conflicts

git

I recently fat-fingered a CMD+Tab and ended up closing my terminal (with a CMD+Q). I was right in the middle of a conflict resolution. Now, I could grep my repo for >>>>>> or <<<<<< and then write some Bash command to pipe the output through in order to get a concise list of conflicting files, or I could just type this:

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

Done. I love Git!

Say Thanks
Respond
Filed Under