Merging

• ClearCase performs text-based merges only

• Merges are “language-neutral” - ClearCase does not analyze contents of source code

• Can recursively find branches to merge in entire repository or merge per-file basis

• Human intervention is required for conflicts

  • No merge tool can automatically resolve merge conflicts

• ClearCase greatly automates/enhances the merge process

Previous slide

Next slide

Back to first slide

View graphic version