git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Checkout fails when one branch contains a directory with the name of a file in the other branch

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
May 7, 2007, 11:31 UTC
Message-ID
<Pine.LNX.4.64.0705071329170.4167@racer.site>
In-Reply-To
<ubqgw51tf.fsf@assurancetourix.xs4all.nl>
Hi,
On Mon, 7 May 2007, Tom Koelman wrote:
Show 8 quoted lines
> 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

Previous: Tom KoelmanNext: Tom Koelman
Message 2 of 4 in “Checkout fails when one branch contains a directory with the name of a file in the other branch”
  1. Tom KoelmanMay 7, 2007
  2. Johannes SchindelinMay 7, 2007
  3. Tom KoelmanMay 7, 2007
  4. Johannes SchindelinMay 7, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.