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
Jeff King <peff@peff.net>
Date
Jun 26, 2010, 05:58 UTC
Message-ID
<20100626055812.GA10290@coredump.intra.peff.net>
In-Reply-To
<AANLkTinQu19HKUC2a_JkSyeZ_SynE11eNwgH9zEMiY8g@mail.gmail.com>
On Fri, Jun 25, 2010 at 11:06:46AM +0530, Sabyasachi Ruj wrote:
Show 6 quoted lines
> >> 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?

I would certainly expect it (at least in the index). Posting here is fine to report, but you may want to repost with a more descriptive subject line and a summary of the issue. That will get the attention of people interested in merge issues.

-Peff
Previous: Sabyasachi Ruj
Message 4 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.