From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Mar 2008 06:31:53 GMT
Subject: Re: renaming a file into a directory causes a pull error on older repos
Message-ID: <7vlk4f442u.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080319015156.GA8874@kroah.com>

Greg KH <greg@kroah.com> writes:

> I've tried to create a simple script to duplicate this problem, and I
> really can not do it at all, including trying to modify the file that
> got clobered by the directory name.  Odd.  I need to look at that repo
> and verify what I did to make sure it wasn't my fault here...

You might have noticed that I've tried it as well.

And it is never your fault.  If git prevented you from trashing your local
modifications, that is a good thing that it errored out.