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: Tue, 26 Feb 2013 15:18:20 -0500 [thread overview]
Message-ID: <20130226201820.GD13830@sigill.intra.peff.net> (raw)
In-Reply-To: <7v7glun8kt.fsf@alter.siamese.dyndns.org>
On Tue, Feb 26, 2013 at 12:06:42PM -0800, Junio C Hamano wrote:
> It seems that we have a corner case bug in two-way merge to reset
> away the conflicts with "read-tree -u --reset HEAD ORIG_HEAD".
Isn't this a repeat of:
http://thread.gmane.org/gmane.comp.version-control.git/202440/focus=212316
whose fix never got finalized? It's on my todo list, but it seems that
items keep sinking further down on that list, rather than getting
completed. :-/
-Peff
next prev parent reply other threads:[~2013-02-26 20:18 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 [this message]
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
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=20130226201820.GD13830@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).