From: Jeff King <peff@peff.net>
To: Sabyasachi Ruj <ruj.sabya@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Confusion about content of conflicted file after : git remove/add
Date: Sat, 26 Jun 2010 01:58:12 -0400 [thread overview]
Message-ID: <20100626055812.GA10290@coredump.intra.peff.net> (raw)
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
prev parent reply other threads:[~2010-06-26 5:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-24 4:53 Confusion about content of conflicted file after : git remove/add Sabyasachi Ruj
2010-06-24 6:10 ` Jeff King
[not found] ` <AANLkTilo0b9aL3oxk0b8eNkBWygwA7xSclTy1MaK8qba@mail.gmail.com>
2010-06-25 5:36 ` Sabyasachi Ruj
2010-06-26 5:58 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100626055812.GA10290@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=ruj.sabya@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).