Use this window to specify what action to take for
a merge conflict. A version was created as a result of a deliver (or rebase)
operation and cannot be automatically merged with an existing version in the
target stream. The path to the version is shown. Under Please choose
one of these options, set one of the following options:
- Start the Diff Merge tool for this element
- Starts Diff Merge for the selected version. This tool lets you see the
differences in contributing versions and determine the changes to reside in
the version in the target stream. The merge arrow is drawn to the target version
and its merge status is changed to Yes..
- Skip this element, I'll merge it later
- Proceeds to the next element in the list. The merge status is set to No.
You can resolve the conflict outside the deliver (or rebase) operation. When
you resume the operation, the merge status is changed to Yes and the arrow
is drawn to the version in the target stream if no conflicts are detected.
- Backout from the current Delivery
- Cancels the current deliver (or rebase) operation and undoes any changes
made so far.
To close the window and continue, click one of the following
commands:
- OK
- Confirms your selection for this version only. If another version with
a conflict is detected, you see this window again.
- OK to All
- Confirms your selection for this version and any subsequent contributing
versions that cannot be merged automatically. You do not see this window again.