Re: Problems with GIT under Windows - "not uptodate"

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sep 1, 2009, 22:56 UTC
Message-ID: <alpine.DEB.1.00.0909020052550.8306@pacific.mpi-cbg.de>
In-Reply-To: <loom.20090901T184650-434@post.gmane.org>

Hi,

Eric, is there any good reason you neglect netiquette? I re-added David to the Cc: list.

On Tue, 1 Sep 2009, Eric Raible wrote:

Show 8 quoted lines

>  <david.hagood <at> gmail.com> writes:
> 
> > Error: Entry "Some file name" not uptodate: cannot merge.
> > 
> > We've tried "git reset --hard; git pull ." We've tried "git reset --hard;
> > git checkout -f master". Neither seems to fix this.
> 
> http://article.gmane.org/gmane.comp.version-control.git/122862

To summarize: the suggestion is "rm .git/index && git reset --hard".

I have to stress the same point as in "reset --hard considered harmful" a while back, though.

Actually, I started writing a patch to provide "git checkout --fix-crlf" some weeks ago, but I constantly run out of time to finish it.

Ciao, Dscho