[prev] [index] [next]

RCS (cont)

Sometimes, two sets of development work may proceed independently.

To handle this, RCS supports revision branches.

[Diagram:Pic/branches.png]

Branches are merged via the rcsmerge command

  • if no conflicts, merge can be done automatically
  • if there are conflicts, developer must choose how to merge