Michael J Gruber <git@drmicha.warpmail.net> writes:

quoted text
> Daniel Blendea venit, vidit, dixit 17.06.2010 11:35:
>> Hello,
>> 
>> A while ago I have cloned on my computer a git repo.
>> Since then, the developers have modified several files in the repo.
>> Now I want to update my copy with the latest changes.
>> 
>> I do 'git pull' but I get 'Your local changes to .... would be
>> overwritten by merge.  Aborting.'
>> I didn't modified any local file. I tried using 'git stash save' but no luck.

Which OS? Do you have any crlf conversion enabled? Any filter set in
.gitattributes?

quoted text
> Most likely the remote side did a non-forward push and brought you in
> that situation.

A non-fast forward push would force a non-fast forward pull,
possibly/probably with conflicts, but wouldn't trigger this message,
which is generated before the merge is actually started.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html