Chapter 14 Integrating Changes

In a parallel development environment, the opposite of branching is merging. In the simplest scenario, merging incorporates changes on a subbranch into the main branch. However, you can merge work from any branch into any other branch. This chapter describes techniques and scenarios for merging versions of elements and branches. ClearCase includes automated merge facilities for handling almost any scenario.