From: Jeff King <peff@peff.net>
Date: Sat, 26 Jun 2010 05:58:12 GMT
Subject: Re: Confusion about content of conflicted file after : git remove/add
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:

> >> 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