Re: "error: Entry 'runtime/doc/tags' not uptodate. Cannot merge." with vim_mainline git repository

On Tue, Dec 01, 2009 at 04:31:47PM +0100, Dennis Benzinger wrote:
> I use the vim_mainline git repository at
> http://repo.or.cz/w/vim_mainline.git to get the vim sources.
> Since a few days I get an "error: Entry 'runtime/doc/tags' not uptodate. Cannot merge." message when I do git pull.
>
> How can I restore the version in the vim_mainline repository?

git checkout runtime/doc/tags

> And what could have caused this error?

I don't know offhand. It was happening for me too but then stopped.

--
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Gregory H. Margo
gmargo at yahoo/com, gmail/com, pacbell/net; greg at margofamily/org

--
You received this message from the "vim_use" maillist.
For more information, visit http://www.vim.org/maillist.php