Open all files with conflicts
Open all files that have a merge conflict on your editor.
git diff --name-only --diff-filter=U | xargs $EDITORWritten by Rodrigo Kochenburger
Related protips
1 Response
This rocks! Except I get this error:
Vim: Warning: Input is not from terminal.And then my terminal gets really messed up after I exit vim. This works better for me (bash):
vi $(git diff --name-only --diff-filter=U)I made the following alias in my git config:
do = !"vim $(git diff --name-only)"
over 1 year ago
·
Have a fresh tip? Share with Coderwall community!
Post
Post a tip
Best
#Git
Authors
Related Tags
#git
Sponsored by #native_company# — Learn More
#native_title#
#native_desc#