Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I’m using vimdiff for a git merge. Is there a quick way to select 1 file to use, right now i’m just selecting everything from one buffer, replacing the $MERGE with that, and then saving. I guess I can macro that, but was wondering if there is a better way.
Thanks!
You should take a look at Tim Pope’s Fugitive plugin. It’s a really usefull plugin.
When you run
Gdiffin a conflicted file, 3 files are opened – target, merged and working copy. You would switch to the file you want to save, and executeGwrite!to save that file.There is a whole Vimcast explaining how to resolve merge conflicts with this plugin(And other 5 vimcasts explaining more about Fugitive.vim).