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

Larry McVoy
2002-03-11T21:01:45Z

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