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!
Written by Jason Rogers
Related protips
Have a fresh tip? Share with Coderwall community!
Post
Post a tip
Best
#Git
Authors
khasinski
591.1K
dmichaelavila
500.4K
Related Tags
#git
Sponsored by #native_company# — Learn More
#native_title#
#native_desc#