Quote:
|
Originally Posted by Keith Watson
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. |
Be sure to read the section
Merging from a branch several times. I missed that part the first time I merged a branch and it caused me grief later on.
We ended up with only one branch, when I completely rewrote our PID framework. I worked off the PID branch while everyone else worked from head.