On Sun, Jan 17, 2016 at 08:39:19PM -0800, John Little wrote: > I've following the instructions on vim.org, which says if you have > local changes use git fetch followed by git merge. This has been a > dog's breakfast at times, with me running various git commands I don't > understand (as suggested by cryptic messages) trying to shut git up. > runtime/doc/tags usually gives trouble, despite me putting it in > .gitignore, and deleting it locally.
runtime/doc/tags really shouldn't be part of the repository. It's a generated file. Bram didn't agree last time this was brought up. That being said, simply deleting the file from disk isn't going to help because that's just another type of uncommitted modification to a file that Git is versioning. Even if you were to commit the delete, then you'll just have to merge a conflict (you deleted it and Bram changed it) any time the tags file is regenerated by Bram. 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 Cheers, -- James GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <[email protected]> -- -- 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
