[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: Merging in CVS

From: Jenn Vesperman
Subject: RE: Merging in CVS
Date: 23 Nov 2002 06:02:27 +1100

On Sat, 2002-11-23 at 05:28, MacMunn, Robert wrote:
> It isn't a slick interface. In Clearcase it is the merge tool itself that
> gives you the ability to deal with the conflicts easily.

Check the various CVS graphical clients - some of them display the
conflicts in merges in a merge tool. It sounds to me like that's what
you're after.

CVS just allows you to do the same thing in your own choice of editor.

Jenn V.
    "Do you ever wonder if there's a whole section of geek culture 
                you miss out on by being a geek?" - Dancer.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]