Re: Kernel SCM: When does CVS fall down where it REALLY matters?

Rik van Riel
2002-03-11T21:28:48Z

On Mon, 11 Mar 2002, Larry McVoy wrote:
> On Mon, Mar 11, 2002 at 05:36:23PM -0300, Rik van Riel wrote:
> > ... and I prefer the one which is chosen with 'f2', nothing beats
> > the [left] [right] buttons!

> The fact that you can get by with the 2way merge says that the merges you
> are doing are easy. When they get harder, you'll need better tools.

Actually, it shows I know the VM code so well that I don't need to
see the common ancester to know what to merge. When I get into a
situation where I _don't_ know the code so well, I guess I'll want
the 3-way merge tool, like you said...

regards,

Rik
--
<insert bitkeeper endorsement here>

http://www.surriel.com/ http://distro.conectiva.com/