Procedure
- In the browser, right‑click the relevant
diagram, and select View All Diagrams.
- Right-click the relevant element in the
diagram, and depending on your situation:
- For elements that exist in both versions, select Take
from Left or Take from Right.
- For elements that exist in only one of the versions,
select Include in Merge or Exclude from
Merge.
Results
Additional changes permitted in graphical
merge mode
When working in graphical mode,
in addition to making merge decisions:
- You can move diagram elements on the "merged" version
of the diagram that is displayed.
- You can delete diagram elements from the "merged"
version of the diagram that is displayed.
- You can change element attributes such as arguments.
Note: For most diagrams, you cannot create new elements to add
to the diagram. The exception is statecharts and activity diagrams.
For statechars and activity diagrams, you can create new states, transitions,
and other elements that can exist within a diagram (though you still
cannot create classes, events, and so on.)