Re: [boost] Re: Problem on the CVS version of the top web page

From: Janusz Piwowarski (jpiw_at_[hidden])
Date: 2003-08-24 11:49:34

On Sunday, August 24, 2003, 7:15:11 AM, Daryle Walker wrote:

> I have a "CVS Quick Reference Card" lying around, and the entries for 
> "checkout" and "update" have a sub-option "-j REV" that says "Merge in 
> changes".  That can't fuse one branch into another?  (I wouldn't want 
> to potentially hose our CVS experimenting with this.  Any experts out 
> there that know what this sub-option does?)

You're right, -j option with update command can merge changes between
branches. It works ok, marks places changed in both branches with
standard cvs markers >>>> and <<<<.

Regards,

Janusz