On Tue, Jan 19, 2016 at 3:03 AM, John Little <john.b.lit...@gmail.com> wrote:
> > The simplest thing to do would be to reset the tags file to its > > versioned state before pulling in the latest changes from Bram. > > > > $ git checkout runtime/doc/tags > > I just learned about git checkout recently. This is a nuisance in that I > have to do it every time. It is also possible to commit your local version of the tags file. "git pull" will then merge it with any later changes in the main repo as long as they don't apply to the same lines in a conflicting way. Pavol -- -- You received this message from the "vim_dev" 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_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
