Share this page
View Compare/Merge Table of Action Decisions
When comparing views in a VCM session, VCM compares the state of each pair of items in the source and target views against a table of difference types to determine if the items match the criteria in any of the rows. From that, it decides what, if any, are the default and possible actions for resolving each item difference for a given merge type. The resulting list of default and possible actions is what is presented during the VCM session.
The following table shows the rules VCM uses to decide which actions to take under a given set of conditions for each merge type: Promote, Rebase, and Replicate. The table shows all the possible actions that can be taken in a VCM Session. In the table, the default action is always listed as the first action. Ignoring the item differences is always one of the options.
This table explains how VCM will treat each pair of matching items, one in the source and one in the target. Because the table indicates what actions VCM allows and what action VCM will select by default, it can be considered a set of use cases. The actions allowed by VCM depend on the type of operation (Rebase, Promote, or Replicate), and the following characteristics of the items:
- Whether an item in the source matches an item in the target (that is, whether the item exists in only one or both views).
- Whether the matching items are on the same branch or different branches (based on their dot notations).
- Whether the corresponding items are in the same location in the two views (that is, in the same StarTeam folder path. A difference in location indicates that one or both of the matching items has been moved).
- Whether additional revisions of the matching items have occurred since the last merge.
- Whether the target item is a floating child of the source item.
Note: The common ancestor of the matching items or the merge point set for the matching items is used to determine if changes have been made to the source and target items.
| ID | Description | Replicate | Rebase | Promote | Possible Actions |
|---|---|---|---|---|---|
| 100 | Parent Folder Failed. | x | x | x | Needs Review, Ignore. |
| 110 | Parent Folder Ignored. | x | x | x | Ignore, Needs Review. |
| 200 | Target folder has floating Share in source view. | x | x | x | Needs Review, Ignore (overlayed on other rows). |
| 620 | Deleted in target (Promote). | x | Ignore, Needs Review, Reverse Share, Share. | ||
| 600 | Deleted in target. | x | x | Ignore, Needs Review, Share. | |
| 520 | New in source, shared (Promote). | x | Needs Review, Ignore, Share. | ||
| 510 | New in source (Promote). | x | Reverse Share, Ignore, Needs Review, Share. | ||
| 500 | New in source. | x | x | Share, Ignore, Needs Review. | |
| 800 | Deleted in source. | x | x | x | Delete, Ignore, Needs Review. |
| 900 | Deleted in source, target on different branch. | x | x | x | Ignore, Delete, Needs Review. |
| 1000 | Deleted in source, modified in target. | x | x | x | Ignore, Delete, Needs Review. |
| 700 | New in Target | x | x | x | Ignore, Delete, Needs Review. |
| 1230 | Floating child root share, source unbranched (Promote). | x | Delete-and-Reverse-Share, Ignore, Mark Resolved, Needs Review, Repin. | ||
| 1220 | Floating child share (Promote). | x | Needs Review, Mark Resolved, Ignore, Repin. | ||
| 1210 | Floating child share. | x | x | Repin, Ignore, Mark Resolved, Needs Review. | |
| 1200 | Identical in source and target. | x | x | x | Ignore, Needs Review. |
| 1300 | Unchanged since last merge. | x | x | x | Ignore, Needs Review, Overwrite. |
| 1410 | Modified in source, target is child share of source (Promote). | x | Delete-and-Reverse-Share, Ignore, Mark Resolved, Needs Review, Repin. | ||
| 1405 | Modified in source, same content. | x | x | x | Mark Resolved, Ignore, Needs Review, Repin. |
| 1408 | Modified in source, some changed properties excluded. | x | x | x | Merge, Ignore, Mark Resolved, Needs Review, Overwrite, Repin. |
| 1400 | Modified in source. | x | x | x | Repin, Ignore, Mark Resolved, Needs Review. |
| 1510 | Modified in source, target on different branch, same content. | x | x | x | Mark Resolved, Ignore, Needs Review. |
| 1500 | Modified in source, target on different branch. | x | x | x | Merge, Ignore, Mark Resolved, Needs Review, Overwrite. |
| 1610 | Modified in source, modified in target, same content. | x | x | x | Mark Resolved, Ignore, Needs Review. |
| 1600 | Modified in source, modified in target. | x | x | x | Merge, Ignore, Mark Resolved, Needs Review, Overwrite. |
| 1720 | Modified in target, same content. | x | x | x | Ignore, Mark Resolved, Needs Review. |
| 1700 | Modified in target. | x | x | x | Ignore, Mark Resolved, Needs Review, Overwrite. |
| 1900 | Moved in source. | x | x | x | Move, Ignore, Mark Resolved, Needs Review. |
| 2000 | Moved in source, target on different branch. | x | x | x | Ignore, Mark Resolved, Move, Move-and-Overwrite, Overwrite, Needs Review. |
| 2050 | Moved in source, modified in target. | x | x | x | Ignore, Mark Resolved, Move, Move-and-Overwrite, Overwrite, Needs Review, Overwrite. |
| 2060 | Moved in source, branched and modified in target. | x | x | x | Ignore, Mark Resolved, Move, Move-and-Overwrite, Needs Review, Overwrite. |
| 2100 | Moved in source, moved in target. | x | x | x | Ignore, Mark Resolved, Move, Needs Review. |
| 2150 | Moved in source, moved and modified in target. | x | x | x | Ignore, Mark Resolved, Move, Move-and-Overwrite, Needs Review, Overwrite. |
| 2200 | Moved in target. | x | x | x | Ignore, Mark Resolved, Move, Needs Review. |
| 2205 | Moved and modified in target. | x | x | x | Ignore, Mark Resolved, Move, Move-and-Overwrite, Needs Review, Overwrite. |
| 2410 | Moved and modified in source (Promote). | x | Ignore, Mark Resolved, Move, Move-and-Overwrite, Needs Review, Overwrite. | ||
| 2420 | Moved and modified in source, same content. | x | x | Move, Mark Resolved, Ignore, Move-and-Repin, Needs Review, Repin. | |
| 2408 | Moved and modified in source, some changed properties excluded. | x | x | x | Move-and-Merge, Ignore, Mark Resolved, Merge, Move, Move-and-Overwrite, Move and Repin, Needs Review, Overwrite, Repin. |
| 2400 | Moved and modified in source. | x | x | Move-and-Repin, Ignore, Mark Resolved, Move, Needs Review, Repin. | |
| 2530 | Moved and modified in source, target on different branch, modified in target, same content. | x | x | x | Mark Resolved, Ignore, Move, Needs Review. |
| 2520 | Moved and modified in source, target on different branch. | x | x | x | Merge, Ignore, Mark Resolved, Merge, Move, Move-and-Merge, Move-and-Overwrite, Needs Review, Overwrite. |
| 2510 | Moved and modified in source, target on different branch, same content. | x | x | x | Mark Resolved, Ignore, Move, Needs Review. |
| 2500 | Moved and modified in source, target on different branch. | x | x | x | Merge, Ignore, Mark Resolved, Move, Move-and-Merge, Move-and-Overwrite, Needs Review, Overwrite. |
| 2630 | Moved and modified in source, moved in target, target on same branch, same content. | x | x | x | Move, Ignore, Mark Resolved, Move-and-Repin, Needs Review, Repin. |
| 2610 | Moved and modified in source, moved in target, target on different branch, same content. | x | x | x | Mark Resolved, Ignore, Move, Needs Review. |
| 2600 | Moved and modified in source, moved in target, target on different branch. | x | x | x | Merge, Igonre, Mark Resolved, Move-and-Merge, Move-and-Overwrite, Needs Review, Overwrite. |
| 2615 | Moved and modified in source, moved and modified in target, target on different branch, same content. | x | x | x | Mark Resolved, Ignore, Move, Needs Review. |
| 2805 | Moved and modified in source, moved and modified in target, target on different branch. | x | x | x | Merge, Ignore, Mark Resolved, Move, Move-and-Merge, Move-and-Overwrite, Needs Review, Overwrite. |
| 2910 | Moved and modified in source, moved in target, target is child share of source (Promote). | x | Delete-and-Reverse-Share, Ignore, Mark Resolved, Move, Move-and-Repin, Needs Review, Repin. | ||
| 2908 | Moved and modified in source, moved in target, some changed properties excluded. | x | x | x | Move-and-Merge, Ignore, Mark Resolved, Merge, Move, Move-and-Overwrite, Move and Repin, Needs Review, Overwrite, Repin. |
| 2900 | Moved and modified in source, moved in target. | x | x | x | Move-and-Repin, Ignore, Mark Resolved, Move, Needs Review, Repin. |
| 2730 | Modified in source, moved in target, same content. | x | x | x | Mark Resolved, Ignore, Move, Move-and-Repin, Needs Review, Repin. |
| 2710 | Modified in source, moved in target, target on different branch, same content. | x | x | x | Mark Resolved, Ignore, Move, Needs Review. |
| 2700 | Modified in source, moved in target, target on different branch. | x | x | x | Merge, Ignore, Mark Resolved, Move, Move-and-Merge, Move-and-Overwrite, Needs Review, Overwrite. |
| 2715 | Modified in source, moved and modified, target on different branch, same content. | x | x | x | Mark Resolved, Ignore, Move, Needs Review. |
| 2705 | Modified in source, moved and modifed in target, target on different branch. | x | x | x | Merge, Ignore, Mark Resolved, Move, Move-and-Merge, Move-and-Overwrite, Needs Review, Overwrite. |
| 2810 | Modified in source, moved in target, target is child share of source (Promote). | x | Delete-and-Reverse-Share, Ignore, Mark Resolved, Move, Move-and-Repin, Needs Review, Repin. | ||
| 2808 | Modified in source, moved in target, some changed properties excluded. | x | x | x | Merge, Ignore, Mark Resolved, Move, Move-and-Merge, Move-and-Overwrite, Move-and-Repin, Needs Review, Overwrite, Repin. |
| 2800 | Modified in source, moved in target. | x | x | x | Repin, Ignore, Mark Resolved, Move, Move-and-Repin, Needs Review. |
| 9900 | Unrecognized | x | x | x | Needs Review, Ignore. |
Note: Merge or Mark As Resolved actions are not possible for non-branchable items (requirements, tasks, and topics).
