From: Johan Herland <johan@herland•net>
To: Ittay Dror <ittay.dror@gmail•com>
Cc: 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 13:16:05 +0200 [thread overview]
Message-ID: <200809031316.05336.johan@herland.net> (raw)
In-Reply-To: <48BE56BD.6050805@gmail.com>
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
Also, nowadays, even Bram himself seems to have conceded
PreciseCodevilleMerge in favour of traditional 3-way merge, at least if
you look at item #3 in the following posting from his blog:
http://bramcohen.livejournal.com/52148.html
...Johan
--
Johan Herland, <johan@herland•net>
www.herland.net
next prev parent reply other threads:[~2008-09-03 11:18 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 [this message]
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=200809031316.05336.johan@herland.net \
--to=johan@herland$(echo .)net \
--cc=B.Steinbrink@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=ittay.dror@gmail$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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