Merge directories view

Use this view to merge directories.

The Merge view is opened automatically when a rebase or deliver operation is started and that operation requires a manual merge before completion.

You can adjust display and behavior preferences for the Merge directories view in the Compare/Merge Preferences page (IBM® ClearTeam® Explorer > Integration > Compare/Merge). These preferences include hiding the base contributor pane and automatically scrolling to the first merge point.

Difference and merge point markers

The following table provides a description of the difference markers used in the Compare/Merge view.

Difference type Marker Description
Changed a yellow triangle Indicates that this difference contains lines that are changed from the base contributor.
Default blank space Indicates that this section of text (if a file) or set of files (if a directory) is the same in all contributors. Note that there is no visual marker. However, a hover help is displayed when you hold the cursor over the beginning of the line.
Deleted A lowercase a overlaid by a red x Indicates that this difference does not contain lines that are included in the base contributor.
DeleteMoved A lowercase a overlaid by a red x and to its right a red horizontal arrow Indicates that lines have been removed from this location and moved to a new location. Note that this marker does not apply to directories.
Different Object ID A light blue rectangle overlaying a white rectangle with a dashed outline (This marker applies to comparing or merging directories only and does not apply to text files.) Indicates that this difference contains at least one file or directory that has the same name in the base contributor, but that the file or directory was deleted and created again and is considered to be a different file or directory.
Inserted A lowercase a under which is a red triangle Indicates that this difference contains lines that are not displayed in the base contributor.
InsertMoved A lowercase a under which is a red triangle and to its right a red horizontal Indicates that this difference contains lines that were moved from another location to this location. Note that this marker does not apply to directories.
Padding A white rectangle with a black dashed outline Indicates that Diff Merge has padded this difference with extra blank lines to align text with other contributors, which have insertions in this region. This padding is not displayed in the merge output.
Unchanged green check mark Indicates that this contributor does not differ from the base contributor at this location, but that another contributor does contain differences at this location. Also appears in the base contributor to indicate that there is a difference at the marked point in another contributor.

ClearCase Compare/Merge View Toolbar

The ClearCase® Compare/Merge view toolbar contains the following icons for the merge operation:

Icon name Icon Description
Save Merge Output save merge output icon Save merge output and close Compare/Merge view. If you were merging as part of a rebase or delivery operation, the operation resumes.
Contributor 1 contributor 1 icon Accept changes from contributor 1. When a merge point is selected in a contributor, the button displays a "+" character to right of the numeral.
Note: There are an unlimited number of contributors. A similar button with a unique number is displayed for each contributor. Clicking the button that is associated with a contributor accepts changes from that contributor.
Resolve and Advance resolve and advance icon Resolve the current unresolved difference with the specified output and advance to the next unresolved difference.
Go To First Difference go to first difference icon Highlight the first difference in both contributors.
Note: Note that if you want the Merge view to automatically scroll to the first unresolved difference, you can select the Automatically scroll to the first difference or unresolved merge point option on the IBM ClearTeam Explorer > Integration > Compare/Merge Preferences page.
Go To Previous Unresolved Difference Go To Previous unresolved Difference icon Highlight previous unresolved difference.
Go To Previous Difference Go To Previous Difference icon Highlight previous difference. Only available if there is a difference higher in the file than the currently selected difference.
Go To Next Difference Go To Next Difference icon Highlight next difference. Only available if there is a difference lower in the file than the currently selected difference.
Go To Next Unresolved Difference Go To Next unresolved Difference icon Highlight next unresolved difference.
Go To Last Difference Go To Last Difference icon Highlight the last difference in both contributors.
Menu eclipse drop-down menu icon Displays the Compare/Merge view options menu, which contains the following options:.
  • Save Merge Output
  • Go To First Difference
  • Go To Previous Unresolved Difference
  • Go To Previous Difference
  • Go To Next Difference
  • Go To Next Unresolved Difference
  • Resolve and Advance
  • Hide Base Contributor: Select this to hide the base contributor pane from view. Differences in that pane can still be selected.
  • Accept All Differences From > Contributor #: Select the contributor that you want to accept all differences from.
  • Accept Remaining Differences From > Contributor #: If you have already resolved some differences, then for all the remaining unresolved differences, the difference is accepted from the contributor you choose here.
Pin View pin view icon Click to pin the current Compare/Merge view to your workspace. This allows you to run a new compare or merge operation in a separate Compare/Merge view.
Note: This option is ignored for a Merge view and all Merge views are automatically pinned.