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

Re: git merge bug: creating new files in one branch in a directory that is renamed in another

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 21, 2007, 22:05 UTC
Message-ID
<Pine.LNX.4.63.0701212301340.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<45B3224B.3020800@gmail.com>
Hi,
> [merge branch where directory was renamed, but files were added in the 
>  unrenamed directory]

I think this problem is fundamentally untractable. If you move only some files to another directory, it is more obvious that you don't know where to put the newly created file (indeed, you might need it in _both_).

Another non-obvious reason to fail is that you actually _want_ the new file to be the only one to reside in that directory.

So I think you cannot solve that problem. IOW you have to resolve that conflict manually _anyway_.

Ciao, Dscho

Previous: Shawn O. Pearce
Message 3 of 3 in “git merge bug: creating new files in one branch in a directory that is renamed in another”
  1. Liraz SiriJan 21, 2007
  2. Shawn O. PearceJan 21, 2007
  3. Johannes SchindelinJan 21, 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.