Merge Plugin

Testimonials

    • Please give a big thumbs up to whomever had the idea to throw in Cameo Requirements Management into MagicDraw 18. I'm using the plugin a ton now.
      Cheers!
      Chris Mellroth
      Northrop Grumman
    • No Magic's team were exceptional at delivering software that was on time and within specification.
      President and CEO
      Metalithic Systems Inc.
    • I'm working with MagicDraw for 3 years now and I'm still impressed by the tons of functionalities it has and by the great support team!
      Xavier Seignard
      Sodifrance
    • I just wanted to thank you for your great customer service. I have enjoyed working with you (and MagicDraw) so far, and look forward to doing so increasingly in the future.
      Eric Crane
      Members United Corporate Federal Credit Union
    • One of the best, if not the best object-oriented modeling tools IMO is MagicDraw.
      Mark Lorenz
      Labcorp
    • MagicDraw is BY FAR the greatest modeling tool I have ever used.
      Stan Butler
      Deposco
    • Thank you very much for your help! I must say that I have never experienced such excellent technical support.
      Dr. Jim Arlow
      ClearView Training
    • MagicDraw is very intuitive and robust. The best UML Modeler I've been using so far. 
      Volker Lenz
      IT Services Promotion Agency
    • I really am loving the product. It's just that when I find out that a company actually *listens* for once.
      Gavin Kistner
      Image Refinery Productions
    • I have used multiple modeling tools over the years...by far the best one I've used is MagicDraw.
      Mark Lorenz
      Labcorp
    • The product exceeded all its competitors in every area and was by far the easiest for all our teams to use when building enterprise solutions.
      Allen Scott
      Intelligent Chaos
    • MagicDraw is now my main tool of trade.
      Dr. Darren R C Kelly
      Elements of the Web
    • We knew when we bought our MagicDraw licenses that the product was top of the line. You have just proven to me that your support is also top of the line.
      Stefan Zetterberg
      LearningWell AB

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:

  1. To start merging select Project Merge from the Tools main menu. The Merge Projects dialog opens (see Figure 1).
  2. 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.
  3. 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).
  4. 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

Screenshots

11 model merge

ViewletDescriptionTime (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)

omg-member-logo

nomagic gartner-ad 2013

facebook 32 linkedin 32 twitter 32 youtube 32 rss 32