Merging text elements between UML models

You can merge text elements between UML models in separate merge sessions. For example, if you make a conflicting change to an attribute name or document field, you can merge each conflicting change in a separate merge session.

Before you begin

You must have a merge session open.

About this task

For multiline text elements such as text in a UML opaque expression, opaque behavior, or opaque action, the embedded merge functionality automatically displays the text in the bottom half of the compare view. For text fields that have HTML content such as documentation, the style text will be displayed on the Text tab. You can switch to the embedded merge functionality or use the Merge As Text pop-up menu to do the merge.

Procedure

  1. In the Structural changes view, right-click a conflict; then click Merge As Text.
  2. In the Merge window, resolve all conflicts into the Merged contributor, and click Commit Sub Merge Result.
Feedback