Using xclearcase to Pre-merge from One Branch to Another:
yyy_R95 to xxx_R94

First, we need to run the findmerge in dry-run mode, to make sure our view is set right. So we execute xclearcase:

xxx% xclearcase

In the xclearcase interface:

• We choose to find merges from the yyy_R95 branch to files in our view
• We choose the branch to merge from

  Next, we choose:

• Not to use automatic merge mode
• Not to execute mergers as they are found.
• Not to receive explanations when elements do not need merging.
• After the findmerge completes, choose Not to run the merge script now.
• Enter CR to exit the script dialog.
• Select and open the merge script just produced.
• Inspect the script we produced to make sure only the appropriate files were chosen.

If you incur any problems--such as lots of files are found for merging which you didn't expect--call your product's Buildmeister for assistance. Otherwise, we want to execute the findmerge again, only this time execute the merges as they are found, so we can take advantage of the nice graphical merge interface that ClearCase gives us:

In the xclearcase interface:

• We choose to find merges from the yyy_R95 branch to files in our view
• We choose the branch to merge from

  Next, we choose:

• NOT to use automatic merge mode
• Execute mergers as they are found rather than "batch mode" from a log file
• Not to receive explanations when elements do not need merging
• Supply a comment explaining the reason for the merge

  Then we get on with the merge itself:

• XXX chooses to accept the first change proposed
• But rejects the second proposed change (This is the step which resolves the logic problem!)
• Agrees to save the changes
• Then acknowledges the merge summary

We've now completed a merge from someone elses branch (yyy_R95). Before we can submit our work, however, we still need to pre-merge from the main branch and verify that our changes behave properly with the most recent changes made to the product. And now, let's return to the main seqence for the conclusion of our demonstration.