+++ Merge work flow +++
- - Check out a working copy of branch B to the local file system.
- - Merge files from branch A in CVS and not from the local working copy
of branch A on the file system(!) back to the local working copy of
branch B.
- - Commit changes to branch B.
+++ Enf of merge work flow +++
If this procedure is followed, then and only then, merges will be
successful. A local working copy of directories and files always
belongs to one and only one branch and cannot and must not be shared
among branches.