Model Merge enables copying changes between different project versions. This functionality is usually needed when there are several branches that reflect different releases or versions of the product, e.g. when certain fixes have to be copied from a release branch to the mainstream development.
Merge functionality in MagicDraw works both on file system files and projects stored in MagicDraw Teamwork server. The general workflow for merging projects is as follows:
- To start merging select Project Merge from the Tools main menu. The Merge Projects dialog opens (see Figure 1).
- Choose source project and target project (changes are going to be copied from the source to the target project). Source and target projects may be stored in file system or the Teamwork server. If both projects are stored in the Teamwork server, the ancestor is determined automatically.
- The Merge window appears which allows analyzing changes made in both contributors and resolving conflicts occurred on them (e.g. when the same class is edited in both contributors) (see Figure 2).
- After accepting and rejecting changes and resolving conflicts, the user is asked to confirm changes, but made to the target.
Figure 1 – The Merge Projects dialog
Figure 2 – The Merge window
|Viewlet||Description||Time (min)||Size (MB)||View|
|Model Merge||This demo introduces the Model Merge functionality and shows how changes can be copied from branch to another. It also demonstrates conflict resolution capabilities.||10:07||2.13|
MagicDraw UserManual (see Model Merge section)