Re: BitBucket: GPL-ed *notrademarkhere* clone

Pavel Machek (
Thu, 6 Mar 2003 17:47:43 +0100


> The one thing BK does that makes it worthwhile is the three-way
> merge. This (and the resulting DAG) make handling code from Alan, from
> Linus, from Andrew, and from everyone else possible. With CVS,
> subversion, or any other SCM I've worked with, you have to hand merge
> anything past the first patch. Ugh.

What's so magical about 3way merge?
I thought it would be easy to do even
in CVS...

Written on sharp zaurus, because my Velo1 broke. If you have Velo you don't need...

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to More majordomo info at Please read the FAQ at