From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Sep 2007 23:27:01 GMT
Subject: Re: Problem with merge when renaming
Message-ID: <7vejgvtv0a.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20070918224447.GC14488@steel.home>

Alex Riesen <raa.lkml@gmail.com> writes:

> Junio C Hamano, Wed, Sep 19, 2007 00:28:39 +0200:
>> "David Euresti" <evelio@gmail.com> writes:
>> 
>> > I think I found a problem when you move a file into a directory of the
>> > same name.  Here's what I did.
>> 
>> Two questions.
>> 
>>  (1) git --version?
>
> it happens with very recent git (as of today)
>
>>  (2) if you do "git merge -s resolve" instead of just "git
>>      merge", do you see a difference?
>
> yes: it has more error output.
>
> Trying really trivial in-index merge...
> warning: Merge requires file-level merging
> Nope, a really trivial in-index merge not possible
> Trying simple merge.
> Simple merge failed, trying Automatic merge.
> error: init: is a directory - add individual files instead
> fatal: Unable to process path init
> fatal: merge program failed
> Automatic merge failed; fix conflicts and then commit the result.

Isn't this the same as the known issue here?

	<http://permalink.gmane.org/gmane.comp.version-control.git/53402>