Branching and Merging

• Branching allows users to work on files in parallel. This is useful when performing bug fixes to a released version while normal development continues on the main development trunk.
• The branch changes may be merged to the main development trunk at any time. CS-RCS merges the changes automatically and highlights conflicts, if any. (Conflicts may happen if the same line has been changed in both the branch and the trunk.)
• CS-RCS supports unlimited number of branches, including nested branches, and multiple merging of branches to the trunk.

Click on picture to enlarge