When you are satisfied with the changes you have done on a branch, you may want those changes to be available on the main line of development. Incorporating changes from one branch to another, is known as merging. To merge from a branch, do the following:
Move your local copy to the branch you want to merge the changes into.
Select the top level directory of the project. (If you know exactly what directories and files are part of the branch, you may select these instead.)
Click the right mouse button on the selction, and choose the Update selection menu item.
Make sure Create missing directories that exist in the repository is checked.
Select the Merge options tab.
Click the Only this rev./tag radio button.
n the Only this rev./tag input field, enter the tag name of the branch you want to merge from. If you want to merge from a given timestamp in this tag, check the Date radio button and type in your preferred timestamp as well.
Press the OK button.
Any changes on the branch will now be merged into your local copy. You will probably also want to commit the merged files back to the repository, as described in Sending Your Changes to CVS.
Important note: The merge given above will try to merge changes from the start of the branch. If you do the operation a second time (to merge changes done to the branch after the last merge), merging from the start of the branch is not what you want, and it will most likely get you into trouble. To get around this problem, you should give the branch a new tag after every merge, and use the new tag when naming the branch for subsequent merges.
