I wish I could take credit for this information, as it's really smart, and has helped me already thanks to @cpliakas for pointing out the original link on a crappy geocities site that is now down due to the death of geocities. If you are the original author of this information, let me know, and I'll gladly throw a link to your new site!

How to Change a File in the Branch

Check Out Branch $ cd ~/work-rel-3-0 $ cvs co -r rel-3-0 java

...do your changes to the branch...

Commit your changes to the branch

$ cvs update [file-name]

$ cvs commit [file name]

NOTE: the update and commit commands don't need the -r option. They know you are working in the branch.

How To Merge Branch Changes back to the Main Trunk

Check Out Main Trunk

$ cd ~/work

$ cvs co java

Merge the branch changes back to the Trunk

$ cvs update -j rel-3-0 [file name]

$ cvs commit [file name]