From: Tom Koelman <tkoelman@xs4all.nl>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: Checkout fails when one branch contains a directory with the name of a file in the other branch
Date: Mon, 07 May 2007 13:32:46 +0200 [thread overview]
Message-ID: <463F0E5E.6000204@xs4all.nl> (raw)
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
next prev parent reply other threads:[~2007-05-07 11:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-07 11:07 Checkout fails when one branch contains a directory with the name of a file in the other branch Tom Koelman
2007-05-07 11:31 ` Johannes Schindelin
2007-05-07 11:32 ` Tom Koelman [this message]
2007-05-07 13:00 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=463F0E5E.6000204@xs4all.nl \
--to=tkoelman@xs4all.nl \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).