Preparing for merge

You can customize the model merge procedure by changing Merge and Compare options in the Environment Options dialog.

To access Merge and Compare environment options

1. In the main menu, select Options > Environment.
2. In the Environment Options dialog, expand the General option group and select Merge and Compare options.
   
   
   

You can use Merge and Compare environment options to customize model merge in the following ways:

• Change the optimization mode:
  To merge models faster, set the Optimize for option to Speed . This is the default setting and it is sufficient for most projects. However, the Speed option requires more memory. To merge large models, set the Optimize for option to Memory. Sometimes the memory required for the Speed mode exceeds the memory allocated for the modeling tool. In this case, switch to the Memory mode, which conserves memory. However, this option slows the procedure down considerably.
  
  
• Disable order changes detection in properties/tags:
  In the Do Not Detect Order Changes for option value cell, specify the names of properties/tags whose order changes should not be detected while merging.

  Property/tag names must be written in camel case, for example, ownedAttribute, ownedElement, etc.

• Enable the detection of changes in derived properties:
  In the Detect Changes in Derived Properties option value cell, specify the derived properties whose changes you want to track while merging.
  
  • Derived properties should be specified using the following format: <ElementType>.<derivedPropertyName>. Element type must be written the same way as it is shown in the element Specification window, and derived property name must be written in camel case. For example, the Type property of a Lifeline should be specified as Lifeline.type.
  • Keep in mind that tracking derived properties reduces merge performance.

• Change the default conflict resolution contributor:
  Conflicting changes detected during merge are automatically resolved by accepting changes either from the target or the source version. To accept changes from the target version when a conflict occurs, set the Automatically Resolve Conflicts by Choosing option to Target. To accept changes from the source version when a conflict occurs, set the Automatically Resolve Conflicts by Choosing option to Source.
  
  
• Select which changes to detect in diagrams:
  To detect changes only in diagrams that were loaded (open) when the changes were made, set the Detect Changes in Diagrams option to Direct Changes. To detect changes in all diagrams of the model, set the Detect Changes in Diagrams option to All Changes.
  
  
• Choose whether to detect changes in the diagrams of used projects:
  If you want to track changes in the diagrams of used projects in Teamwork Cloud, set the Detect Changes in Diagrams from Used Projects in Teamwork Cloud option to true. Otherwise, set the option to false. Setting the option to false may improve the merge performance.

Related pages

• Understanding merge types
• Understanding change concept
• Starting Model Merge
• Analyzing and managing merge results
• Finishing and canceling merge