Use the ClearCase Merge Manager to find resources in a ClearCase
view that need to have changes merged from a version in a VOB.
Before you begin
You must connect to a Rational ClearCase server to use the
ClearCase
Merge Manager.
About this task
The ClearCase Merge Manager works as follows:
- It considers a set of versions, which you specify on the Select elements page of the ClearCase Merge Search wizard.
- For each of these versions, the merge manager examines the relationship
between the version in the target view and a from-version selected
using criteria you specify on the Specify selection criteria and merge options page. It determines whether a merge is required from
that version to the version in the target view.
- The merge manager then displays the list of merge candidates in the Merge Manager Search Results view.
Some merge candidates can be merged automatically. Others must be merged manually,
using ClearCase
tools or, in the ClearCase Remote Client for Eclipse, Eclipse tools.
You typically use the merge manager with base ClearCase, before you
check in resources that may have modifications that conflict with ones you
have made. If you use UCM, the Rebase Stream and Deliver from Stream operations subsume
merge manager functionality for most use cases.
To start the merge manager:
- In the ClearCase Navigator, select the ClearCase
view in which you want to search for resources that may need to be merged. The view you select will be used as the target view for the merge.
- Click the ClearCase Merge Search
icon on the ClearCase advanced toolbar.
- In the ClearCase Merge Search wizard, specify
merge search options.
- When the search is complete, examine the results in the Merge Manager Search Results view and specify how to carry out any required merges.
Results
If you choose to manually start a merge, the default tool associated
with the object type starts. You can change which tool starts by default for
different types on the
Compare/Merge preferences
page.