Re: Merging in CVS

[david]

> 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.
>
Not in all cases.  The conflicts I've gotten have usually not been a
result of total rewrites, but of conflicting changes for one or
more functionality changes, and so they really do need to be merged
rather than simply selecting one or the other.  That's when it
gets difficult, and no tool can make it much easier.

When it is a matter of selecting one version or the other, then
with any decent text editor it should be a matter of a few
keystrokes to remove the one you want.  (If you are using an
editor where this would be a big deal, you might want to look
into changing editors.  There's no reason to work with inferior
tools when superior ones are free and available on all major
platforms.)
 
So, CVS handles most merges by itself.  It refers what it can't
resolve to the developer, who can use his or her favorite editor
to resolve the conflicts manually.  The mechanics may not be
slick, but they're reasonable enough for an operation that really
shouldn't be all that common.  Since the advantage of Clearcase
here can only be in the slickness of mechanics, it really can't
be all that great.

-- 
Now building a CVS reference site at http://www.thornleyware.com
address@hidden