How do you manage code changes?

[Keith Watson]

Originally Posted by Eldarion

Do you have any experience branching from the main revision? I have been running into some problems, mainly I don't know how to merge the branch back into the head revision.

I used cvs (including scripts written on top of cvs) for many, many years. We did not use branches very often. More than 95% of our stuff was done on the mainline. Branching is best used when you need to do isolated development with version control while the mainline goes through several revisions.

If you use TortoiseCVS check the User's Guide, it's simple. If you use a flavor of regular cvs look for "cvs update -j branchname". This means "join the branch to the mainline". Here is some documentation on Branching and Merging.