On Sep 9, 2015 9:04 PM, "toothpik" <toothp...@gmail.com> wrote: > > I used to sometimes have a problem with the tags module when we were > under hg, and I had a specific set of things I did to get around it > > it seems the problem has followed us to git -- here's my pull: > > Wed 19:30 ~/.build/vim/vim: git pull > remote: Counting objects: 39, done. > remote: Compressing objects: 100% (38/38), done. > remote: Total 39 (delta 10), reused 0 (delta 0), pack-reused 0 > Unpacking objects: 100% (39/39), done. > From https://github.com/vim/vim > 3cbe0c0..ed84b76 master -> origin/master > * [new tag] v7.4.865 -> v7.4.865 > From https://github.com/vim/vim > * [new tag] v7.4.862 -> v7.4.862 > * [new tag] v7.4.863 -> v7.4.863 > * [new tag] v7.4.864 -> v7.4.864 > error: Your local changes to the following files would be overwritten by merge: > runtime/doc/tags > Please, commit your changes or stash them before you can merge. > Aborting
"git checkout runtime/doc/tags" will restore a modified file to its unmodified state. Cheers, James -- -- 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.
