On Friday, November 21, 2014 4:03:26 PM UTC-5, jml wrote: > 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.
Hi, There are some excellent screencasts on using the fugitive plugin in vim with git at [Drew Neil’s vimcasts.org site](http://vimcasts.org/categories/git/). He gives a good overview particularly of how to work with the diff commands in vim to carry out git tasks. Watching them was how I got started. Hope that helps! Best, Lucas. -- -- 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 vim_mac+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.