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

Re: Possible git bug

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 17, 2009, 15:16 UTC
Message-ID
<alpine.DEB.1.00.0901171613540.3586@pacific.mpi-cbg.de>
In-Reply-To
<87zlhqca4m.fsf@inbox.ru>
Hi,
On Sat, 17 Jan 2009, Damon LaCrosse wrote:
> any chances the attached patch reveals a git bug?

You mean that it produces a merge conflict when a file was modified in one branch, and deleted in the other?

Because that's what you did, basically. You did not rename file1 to file2. You completely changed the contents. I mean, completely.

Ciao, Dscho

Previous: Damon LaCrosse
Message 2 of 2 in “Possible git bug”
  1. Damon LaCrosseJan 17, 2009
  2. Johannes SchindelinJan 17, 2009

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.