When performing a rebase or reconcile operation, there may be conflicts that need to be resolved in the resultant model.
Unlike clashes that are reported in the Clashes dialog, conflicts cannot be resolved by selecting the source or target model value. Instead, the Database-based CM attempts to merge the conflict and you must then resolve those conflicts or confirm that the merge is acceptable in the resultant model.
If a rebase or reconcile operation results in conflicts, the resultant model is left unprotected so that you can resolve those conflicts. After resolving the conflicts, ensure that you protect the model version, so that there is a record of the resultant model from the rebase or reconcile operation.
Reporting conflicts
When conflicts occur during a rebase or reconcile operation, the Operation Completed dialog records how many conflicts occurred during the operation.
In addition, the rebase or reconcile operation creates a Text Diagram or Change Note in the resultant model to identify the items affected by the conflict:
• If change tracking is enabled, the rebase operation creates a Change Note scoped directly to the Model whose name begins with 'Conflicts: ' - the Description of the Change Note contains model object references to the items that have conflicts.
• If change tracking is disabled, the rebase operation creates a Text Diagram scoped directly to the Model whose name begins with 'Conflicts: ' - the content of the Text Diagram contains model object references to the items that have conflicts.
The name of the Change Note or Text Diagram reflects the rebase or reconcile operation to which it relates.
Conflicts
The following circumstances result in a conflict:
• Text conflicts - where a rich text property has changed in both the source and target versions of the model.
• Child name conflicts - where child items of the same name and same parent are created in both the source and target versions of the model.
• Relationship order conflicts - where ordered relationships are changed in both the source and target versions of the model.
Text conflicts
When rich text is changed both in the source and target versions of the model, a rebase or reconcile operation merges the text and identifies any conflicts that need to be resolved. When text conflicts occur, the resultant text will not be valid and you must resolve the conflict.
For example, if the Body text of an Operation in the trunk version from which the branch was created is as follows:
• Original text
• Some more original text
The Body text in the tip version of the trunk is as follows:
• Original text
• Some more original text
• New text in trunk
The Body text in the tip version of the branch is as follows:
• Original text
• Some more original text
• New text in branch
After reconciling the branch to the truck, the resultant Body text will be as follows:
After you have resolved the text conflict and any other conflicts, protect the model version so that there is a record of the rebase or reconcile operation.
Child name conflicts
When child items of the same name and same parent are created in both the source and target versions of the model, a rebase or reconcile operation creates the child items in the resultant model.
You should resolve the child name conflict, by either renaming or deleting one of the child items.
After you have resolved the child name conflict and any other conflicts, protect the model version so that there is a record of the rebase or reconcile operation.
Relationship order conflicts
Where ordered relationships are changed in both the source and target versions of the model, a rebase or reconcile operation attempts to merge the differing relationship orders.
In the resultant model, you should confirm that the relationship orders are as expected, and change the relationship order if required.
After you have resolved the relationship order conflict and any other conflicts, protect the model version so that there is a record of the rebase or reconcile operation.
