Git conflicts into vim arg list
The following will put all conflicting files into vims arg list for easy access.
:args `git conflicts`
Written by Tony R Quilkey
Related protips
1 Response

Damn.. got so used to this being there. You'll also need the following git alias:
git config --global alias.conflicts '!git ls-files -u | cut -f 2 | sort -u'
over 1 year ago
·
Have a fresh tip? Share with Coderwall community!
Post
Post a tip
Best
#Vim
Authors
Sponsored by #native_company# — Learn More
#native_title#
#native_desc#