Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S292533AbSCKV2s>; Mon, 11 Mar 2002 16:28:48 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S293161AbSCKV2i>; Mon, 11 Mar 2002 16:28:38 -0500
Received: from garrincha.netbank.com.br ([200.203.199.88]:39176 "HELO
	netbank.com.br") by vger.kernel.org with SMTP id <S292533AbSCKV2W>;
	Mon, 11 Mar 2002 16:28:22 -0500
Date: Mon, 11 Mar 2002 18:28:03 -0300 (BRT)
From: Rik van Riel <riel@conectiva.com.br>
X-X-Sender: riel@imladris.surriel.com
To: Larry McVoy <lm@bitmover.com>
Cc: "Jonathan A. George" <JGeorge@greshamstorage.com>,
        <linux-kernel@vger.kernel.org>
Subject: Re: Kernel SCM: When does CVS fall down where it REALLY matters?
In-Reply-To: <20020311130122.C26447@work.bitmover.com>
Message-ID: <Pine.LNX.4.44L.0203111826320.2181-100000@imladris.surriel.com>
X-spambait: aardvark@kernelnewbies.org
X-spammeplease: aardvark@nl.linux.org
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

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/

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/