From: Larry McVoy <lm@bitmover.com>
To: Rik van Riel <riel@conectiva.com.br>
Cc: Larry McVoy <lm@bitmover.com>,
"Jonathan A. George" <JGeorge@greshamstorage.com>,
linux-kernel@vger.kernel.org
Subject: Re: Kernel SCM: When does CVS fall down where it REALLY matters?
Date: Mon, 11 Mar 2002 13:01:22 -0800 [thread overview]
Message-ID: <20020311130122.C26447@work.bitmover.com> (raw)
In-Reply-To: <20020311090512.N26447@work.bitmover.com> <Pine.LNX.4.44L.0203111731420.2181-100000@imladris.surriel.com>
In-Reply-To: <Pine.LNX.4.44L.0203111731420.2181-100000@imladris.surriel.com>; from riel@conectiva.com.br on Mon, Mar 11, 2002 at 05:36:23PM -0300
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!
Hah. Try the bk-2.1.x series and try the 3way filemerge. The two way stuff
is nice, and I use it all the time for simple stuff, but when things get
nasty, the 3way filemerge is just amazingly good. You have to invest more
time to learn it because it is showing you more information, but our
customers have one by one moved over to it and would scream bloody murder
if we took it away, it's a huge timesaver.
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. It's
cool that 2way works for you, but it's more cool that when it doesn't, we
already have the next level implemented.
--
---
Larry McVoy lm at bitmover.com http://www.bitmover.com/lm
next prev parent reply other threads:[~2002-03-11 21:01 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-03-07 23:51 Kernel SCM: When does CVS fall down where it REALLY matters? Jonathan A. George
2002-03-07 23:59 ` Rik van Riel
2002-03-08 0:03 ` Cort Dougan
2002-03-09 11:17 ` Roman Zippel
2002-03-09 16:45 ` Kurt Roeckx
2002-03-08 0:26 ` Andrew Morton
2002-03-08 0:36 ` Rik van Riel
2002-03-08 1:48 ` Neil Brown
2002-03-10 20:27 ` Pavel Machek
2002-03-11 21:11 ` Rik van Riel
2002-03-12 16:31 ` Pavel Machek
2002-03-08 7:37 ` Alex Riesen
2002-03-08 0:29 ` Jonathan A. George
2002-03-08 0:43 ` Rik van Riel
2002-03-08 9:32 ` Pau Aliagas
2002-03-08 16:37 ` Rik van Riel
2002-03-08 20:15 ` Pau Aliagas
2002-03-08 20:22 ` Rik van Riel
2002-03-08 20:28 ` Pau Aliagas
2002-03-08 0:38 ` Erik Andersen
2002-03-08 9:38 ` Pau Aliagas
2002-03-09 1:52 ` Val Henson
2002-03-09 2:00 ` Mike Fedyk
2002-03-09 2:25 ` Dave Jones
2002-03-08 1:19 ` Dave Jones
2002-03-08 20:27 ` Jonathan A. George
2002-03-08 21:59 ` Eli
2002-03-08 3:15 ` H. Peter Anvin
2002-03-08 9:39 ` Pau Aliagas
2002-03-11 17:05 ` Larry McVoy
2002-03-11 17:12 ` Randy.Dunlap
2002-03-11 17:25 ` Larry McVoy
2002-03-11 17:53 ` Jonathan A. George
2002-03-11 18:03 ` Larry McVoy
2002-03-11 20:36 ` Rik van Riel
2002-03-11 21:01 ` Larry McVoy [this message]
2002-03-11 21:28 ` Rik van Riel
2002-03-10 19:28 ` Pavel Machek
-- strict thread matches above, loose matches on Subject: below --
2002-03-09 22:22 Tom Lord
2002-03-11 17:10 ` Larry McVoy
2002-03-12 6:09 ` Tom Lord
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=20020311130122.C26447@work.bitmover.com \
--to=lm@bitmover.com \
--cc=JGeorge@greshamstorage.com \
--cc=linux-kernel@vger.kernel.org \
--cc=riel@conectiva.com.br \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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