From: Tom Koelman <tkoelman@xs4all.nl>
Date: Mon, 07 May 2007 11:32:46 GMT
Subject: Re: Checkout fails when one branch contains a directory with the name of a file in the other branch
Message-ID: <463F0E5E.6000204@xs4all.nl>
In-Reply-To: <Pine.LNX.4.64.0705071329170.4167@racer.site>

Johannes Schindelin wrote:
> Hi,
> 
> On Mon, 7 May 2007, Tom Koelman wrote:
> 
>> I am not sure whether this is intentional or not. I am wondering why
>> this scenario fails, and if it is by design, how I should handle this
>> situation:
>>
>> [...]
>>
>> $ git checkout master
>> fatal: Untracked working tree file 'aFile' would be overwritten by merge.
> 
> I tried to reproduce this behaviour, but it worked here. What Git version 
> do you use? Mine says "git version 1.5.2.rc2.2435.ge5a9b".
> 
> Hth,
> Dscho

I tried 1.5.1.3 under cygwin and 1.5.0.6 under Linux FC5.

Regards,
Tom Koelman