Merging (cont)

• Resynch-then-merge reduces time file is checked out on the target/release branch

• Drawback is one extra merge operation to resynch if conflicts are encountered

  • Necessary trade-off if target branch is restricted to users

• ClearCase merge commands:

merge()

findmerge()

MergeManager Wizard (NT only as of 3.2)

Previous slide

Next slide

Back to first slide

View graphic version