Recursive merge strategy?

Kevin Smith yarcs at qualitycode.com
Mon Dec 5 15:51:55 GMT 2005


I saw this on the mercurial list, and I guess I have the same question 
relative to bzr: Would GIT's recursive merge have any benefits for bzr?

Kevin


-------- Original Message --------
Subject: Re: Mercurial and Git recursive merge strategy
Date: Mon, 5 Dec 2005 10:12:03 +0900
From: Samuel Masham <samuel.masham at gmail.com>
To: Matt Mackall <mpm at selenic.com>
CC: mercurial at selenic.com
References: <20051204121007.5cffefa3 at mantra> 
<20051204181650.GF31287 at waste.org> 
<93564eb70512041657md99912dy at mail.gmail.com>

On 05/12/05, Samuel Masham <samuel.masham at gmail.com> wrote:
> On 05/12/05, Matt Mackall <mpm at selenic.com> wrote:
> > On Sun, Dec 04, 2005 at 12:10:07PM +0100, Radoslaw Szkodzinski wrote:
> > > Would it be of any value to port recursive merge strategy to Mercurial?
> > > It is stronger than the previous Git default - stupid three-way merge.
> >
> > Depends.. what is it?
>
> well after a quick browse:
>
> http://www.kernel.org/git/?p=git/git.git;a=blob;hb=HEAD;f=git-merge-recursive.py
>

One further search and the bonus points go to Fredrik Kuivinen, the author.

found the documentation:
http://www.nabble.com/git-merge-recursive%3A-documentation-and-implementation-notes-t540352.html

Samuel




More information about the bazaar mailing list