From: Eric Raible <raible@gmail.com>
Date: Tue, 01 Sep 2009 16:52:45 GMT
Subject: Re: Problems with GIT under Windows - "not uptodate"
Message-ID: <loom.20090901T184650-434@post.gmane.org>
In-Reply-To: <a21e6af7ee05f56fd8c02d0955af1c72.squirrel@localhost>

 <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