From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Thu, 17 Jun 2010 11:58:05 GMT
Subject: Re: git pull (Your local changes to ... would be overwritten by merge)
Message-ID: <4C1A0DCD.2070906@drmicha.warpmail.net>
In-Reply-To: <AANLkTinWS0zWhh0d-yrb7eWMEeQenoAF8tA6-l9BRP_q@mail.gmail.com>

Daniel Blendea venit, vidit, dixit 17.06.2010 13:18:
> Windows 7, did not change anything related to crlf.
> 
> I solved the problem with
> 
> git fetch --all
> git reset --hard origin/master

I guess this shows that correct diagnostics is not a prerequisite for a
successful therapy ;)

(The diagnostics really indicate a work tree with local uncommitted
modifications.)

Michael