From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 06 Jun 2008 15:40:28 GMT
Subject: Re: git mv + git pull issue
Message-ID: <alpine.DEB.1.00.0806061639390.1783@racer>
In-Reply-To: <4848EDDF.7090906@melosgmbh.de>

Hi,

On Fri, 6 Jun 2008, Christoph Duelli wrote:

> cd ../gitmv
> git mv afile newname
> # do not commit
> # now: afile is not in the directory anymore
> # oh, I need those changes my colleague made...
> git pull ../gitmv-clone/
> # now: both(!) afile and newname are in the directory

What is so surprising there?  We _always_ recommend to commit before 
pulling.

Ciao,
Dscho