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

Re: Confusion about content of conflicted file after : git remove/add

From
Sabyasachi Ruj <ruj.sabya@gmail.com>
Date
Jun 25, 2010, 05:36 UTC
Message-ID
<AANLkTinQu19HKUC2a_JkSyeZ_SynE11eNwgH9zEMiY8g@mail.gmail.com>
In-Reply-To
<AANLkTilo0b9aL3oxk0b8eNkBWygwA7xSclTy1MaK8qba@mail.gmail.com>
>> So I think there may be a bug. I don't really see any code in
>> merge-recursive.c to handle conflicts on _both_ sides of a rename, but
>> obviously that is possible here.

Then I guess having contents of both the files would be an expected behavior. Should I report a bug somewhere? - Sabyasachi

Previous: Jeff KingNext: Jeff King
Message 3 of 4 in “Confusion about content of conflicted file after : git remove/add”
  1. Sabyasachi RujJun 24, 2010
  2. Jeff KingJun 24, 2010
  3. Sabyasachi RujJun 25, 2010
  4. Jeff KingJun 26, 2010

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.