go into another dir.
type:
cvs co -r branch2
cd branch2
cvs up -j branch1
cvs com
tom
On Thu, 07 Sep 2000, Benjamin Balagot wrote:
> Hello,
>
> I'm new to CVS and would like to find some answers.
>
> We have a BRANCH e.g. branch1 that was branched off
> the main line
> and another branch e.g. branch2 that I recently
> branched off the main line.
>
> How can I merge the 2 branches so that all additional
> files in branch1 will show
> up in branch2?
>
> Thanks!
>
> Ben
>
> __________________________________________________
> Do You Yahoo!?
> Yahoo! Mail - Free email you can access from anywhere!
> http://mail.yahoo.com/
