Last Updated: February 25, 2016
· jacaetevha

Git: Show Conflicts


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!