I have a problem where we originally had one cvsroot, with two branches of certain modules (lets call them MAIN and B)..... Then somebody went abroad and took a COPY of the cvsroot to work on branch B, meanwhile work on branch MAIN continued in the office..... The problem is now that I want to merge in all of the changes that were done on branch B back into the main CVSROOT, so that I can then merge branch B into branch MAIN.... HELP! There has to be an easy way to do this!
begin:vcard n:Campbell;Robert tel;fax:(403) 266-5050 tel;home:(403) 272-2384 tel;work:(403) 262-0780 x-mozilla-html:TRUE url:www.flagshipgeo.com org:Flagship Geo;Calgary version:2.1 email;internet:[EMAIL PROTECTED] title:Project Manager adr;quoted-printable:;;Suite 200=0D=0A839 - 5th Ave. SW. ;Calgary;Alberta;T2P 3C8;Canada x-mozilla-cpt:;10048 fn:Robert Campbell end:vcard
