On 21 Nov 2014, at 13:03, jml <[email protected]> wrote: > Hi there, > > I'm new to using vimdiff and I haven't found a nice tutorial on it. I looked > into the `:help` area, but I don't really understand how that applies to the > single task at hand (a pretty frustrating merge conflict in the repo I'm > working in). I guess I wouldn't mind if someone told me to RTFM, but I also > would love a link to more of a hand-holding primer on what the tool does in > the context of a GIT merge conflict, along with how to get yourself past the > conflict quickly. For example this page > (http://amjith.blogspot.com/2008/08/quick-and-dirty-vimdiff-tutorial.html) > does not seem to clarify that much for me, as something like "do" doesn't > apply in the default view (4 buffers) - I mean, which would be the "other" > window in that case? Etc.
How familiar are you with editing in vim? vimdiff file1 file2 is nothing more than shorthand for vim -d file1 file2. One can also achieve the same just by vertically splitting a window and loading different buffers in each window and then running command :diffthis on each window. The other window would be the one not being actively edited. ‘do’ is a normal mode operation which is equivalent to the command mode :diffget which just means make the current buffer (the one being actively edited) line the same as the other buffer. ‘dp’ and :diffput are the operations for making the non-active buffer line the same as the current buffer line. Hope this helps to clarify. David P Henderson -- "Criticizing evolutionary theory because Darwin was limited is like claiming computers don't work because Chuck Babbage didn't foresee Duke Nukem 3." -- Patrick Coskren -- -- You received this message from the "vim_mac" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_mac" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
