Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
From: "ncal" <nkale at calcas.com> > 6. Now I want to merge. > > If so, does > > cvs update -j RELEASE_03_02112004-bugfixes-branch > > suffice? Yes. on your main dev trunk that will merge the changes from that branch into main. Or, if you're on another branch, it'll merge in the changes from the one branch onto the other. > > What happens when there is a merge conflict? Do I just resolve them, and try > step 6 again? You'll see a conflict entry in the CVS output "C myfile.vb" for example, and it will have conflict markers in it to tell you which part is conflicting. Personally, I use TortoiseCVS + WinMerge and do it visually. > > Another question - now that I've merged, how do I make another fix? Do I > just update to RELEASE_03_02112004-bugfixes-branch, and repeat steps 4,5, 6? Yes. That's where mergepoints help out most--on the second and consecutive updates from that branch to the destination. Mergrpoints remember where you had last merged so the next merge is done cleanly and properly (contrast to the cited documentation passages). > > Also, I use WinCVS gui client, how can the merge be performed using it? I don't use WinCVS myself, perhaps someone who does could comment. I know there are a bunch who frequent this list.