git mergetool -t vimdiff to resolved conflicts in vim mode
git mergetool -t vimdiff
You can use this command to resolve conflicts in vim.
Written by Rashmi
Related protips
3 Responses
Or you can setup it as default (or any else diff tool)
git config --global merge.tool vimdiff
over 1 year ago
·
Nice tip Rashmi. Any idea to use other options instead of vim?
over 1 year ago
·
git mergetool -t
when you hit tab you will find options like meld,gvimdiff and opendiff etc
over 1 year ago
·
Have a fresh tip? Share with Coderwall community!
Post
Post a tip
Best
#Rashmi14yadav
Authors
Sponsored by #native_company# — Learn More
#native_title#
#native_desc#