From: Andreas Ericsson <ae@op5.se>
To: Ittay Dror <ittay.dror@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Björn Steinbrink" <B.Steinbrink@gmx.de>,
"Linus Torvalds" <torvalds@linux-foundation.org>,
git@vger.kernel.org
Subject: Re: Merge seems to get confused by (reverted) cherry-picks
Date: Wed, 03 Sep 2008 13:04:23 +0200 [thread overview]
Message-ID: <48BE6F37.3070302@op5.se> (raw)
In-Reply-To: <48BE56BD.6050805@gmail.com>
Ittay Dror wrote:
> Note: codeville tried to implement a merge algorithm that considers the
> history to decide what the user wants to do:
> http://revctrl.org/PreciseCodevilleMerge. Maybe worth while exploring?
>
I believe that one would still fail for this case, as "ImplicitUndo"
isn't included.
Besides that, I'd rather have something simple that does something
predictable than something complex that pushes the "gets it right"
figure from 98% to 99.2%, while failing in completely annoying and
surprising ways sometimes. Someone or something still has to verify
that the merge produced something sane.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
next prev parent reply other threads:[~2008-09-03 11:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-03 7:20 Merge seems to get confused by (reverted) cherry-picks Björn Steinbrink
2008-09-03 7:25 ` Björn Steinbrink
2008-09-03 7:50 ` Junio C Hamano
2008-09-03 8:37 ` Björn Steinbrink
2008-09-03 15:26 ` Linus Torvalds
2008-09-03 9:19 ` Ittay Dror
2008-09-03 11:04 ` Andreas Ericsson [this message]
2008-09-03 11:16 ` Johan Herland
2008-09-03 17:10 ` Mike Hommey
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=48BE6F37.3070302@op5.se \
--to=ae@op5.se \
--cc=B.Steinbrink@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ittay.dror@gmail.com \
--cc=torvalds@linux-foundation.org \
/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).