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 firstname.lastname@example.org.
Thanks! That document helps. I'm a bit of a newbie, and can't seem to understand the exact steps to create a branch, make changes, and merge. Are these the steps? 1. Tag at release time, e.g, RELEASE_03_02112004 2. Checkout(update to) this tag 3. Create a branch called RELEASE_03_02112004-bugfixes-branch 4. Make fix to files 5. Commit files 6. Now I want to merge. If so, does cvs update -j RELEASE_03_02112004-bugfixes-branch suffice? What happens when there is a merge conflict? Do I just resolve them, and try step 6 again? 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? Also, I use WinCVS gui client, how can the merge be performed using it? Thanks a lot! "Glen Starrett" <grstarrett at cox.net> wrote in message news:mailman.171.1068163710.731.cvsnt at cvsnt.org... > What is a mergepoint, and how does one use it? I started to write a long reply, so I posted it to the wiki instead. Others please feel free to update / correct / clarify my remarks (that's why it's a wiki!). http://www.cvsnt.org/wiki/MergePoint?action=show Regards, Glen Starrett