Concurrent Versions System

$${PREV_TITLE}$

$${NEXT_TITLE}$

Merging

Merging changes from branch to the working copy
```
$ cvs update -j MY_PROJECT_1_1_0-bugfix
```
What if the branch grows after the merge?
Conflicts will occur if you merge the whole branch again

Merging a selected portion of the branch

$ cvs update -j firstbug -j bugfixbranch