From: Mike Hommey <mh@glandium.org>
To: Johan Herland <johan@herland.net>
Cc: "Ittay Dror" <ittay.dror@gmail.com>,
git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Björn Steinbrink" <B.Steinbrink@gmx.de>,
"Linus Torvalds" <torvalds@linux-foundation.org>
Subject: Re: Merge seems to get confused by (reverted) cherry-picks
Date: Wed, 3 Sep 2008 19:10:29 +0200 [thread overview]
Message-ID: <20080903171028.GA1657@glandium.org> (raw)
In-Reply-To: <200809031316.05336.johan@herland.net>
On Wed, Sep 03, 2008 at 01:16:05PM +0200, Johan Herland wrote:
> On Wednesday 03 September 2008, 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?
>
> You haven't been here long, have you? ;)
>
> There was an infamous mailing list discussion between Bram Cohen (who
> created PreciseCodevilleMerge), and Linus Torvalds back in 2005,
> discussing merge strategies. It is well recounted here:
>
> http://wincent.com/a/about/wincent/weblog/archives/2007/07/a_look_back_bra.php
I quite agree with the footnote statement, except on one thing: it would
make it easier to have additional tools to help with such merge
resolutions automatically.
While resolving a rename/delete merge conflict is not a big deal,
resolving function moves from one file to another (possibly new) file is
another story.
Mike
prev parent reply other threads:[~2008-09-03 17:11 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
2008-09-03 11:16 ` Johan Herland
2008-09-03 17:10 ` Mike Hommey [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=20080903171028.GA1657@glandium.org \
--to=mh@glandium.org \
--cc=B.Steinbrink@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ittay.dror@gmail.com \
--cc=johan@herland.net \
--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).