Merging From a Branch - The Simple Case

In the case where you have tried out a new feature and want to merge it with the main trunk, follow this process:
1. Tag the branch with a meaningful tag (we'll see why later):
```
$ cvs tag Release-2-1-branch-fix1
cvs tag: Tagging .
T Makefile
T README
T hello.py
$ 
```
2. Update your working copy to the most recent copy of the main trunk:
```
$ cvs update -A
cvs update: Updating .
U hello.py
$ 
```
3. Use cvs update -j to "join" the branch into the trunk:
```
$ cvs update -j Release-2-1-branch-fix1
cvs update: Updating .
RCS file: /home/cvsroot/hello/hello.py,v
retrieving revision 1.7
retrieving revision 1.7.2.1
Merging differences between 1.7 and 1.7.2.1 into hello.py
$ 
```
4. Resolve any conflicts and commit any changes. The main trunk now includes the changes from the branch.