From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: two-way merge corner case bug
Date: Fri, 1 Mar 2013 18:08:45 -0500 [thread overview]
Message-ID: <20130301230845.GA7317@sigill.intra.peff.net> (raw)
In-Reply-To: <7vppzien3i.fsf@alter.siamese.dyndns.org>
On Fri, Mar 01, 2013 at 03:06:57PM -0800, Junio C Hamano wrote:
> > I can believe it. So do we want to do that fix, then? Did you want to
> > roll up the two halves of it with a test and write a commit message? I
> > feel like you could write a much more coherent one than I could on this
> > subject.
>
> I actually was wondering if we can remove that sole uses of two-way
> merge with --reset -u from "git am" and replace them with something
> else. But we do want to keep local change that existed before "am"
> started, so we cannot avoid use of two-way merge, I guess...
Yeah, I think that is a case we definitely want to keep, as it means any
intermediate work done by the user in applying the patch is not lost.
-Peff
next prev parent reply other threads:[~2013-03-01 23:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-26 20:06 two-way merge corner case bug Junio C Hamano
2013-02-26 20:18 ` Jeff King
2013-02-26 21:41 ` Junio C Hamano
2013-03-01 9:22 ` Jeff King
2013-03-01 16:57 ` Junio C Hamano
2013-03-01 22:36 ` Jeff King
2013-03-01 23:06 ` Junio C Hamano
2013-03-01 23:08 ` Jeff King [this message]
2013-03-01 23:49 ` Junio C Hamano
2013-03-02 0:54 ` Jeff King
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=20130301230845.GA7317@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).