Saturday, 28 April 2018

Rhapsody Tip #32 - Graphical merge using Rhapsody's 3-way DiffMerge tool (Intermediate)

Although Rational Rhapsody has a multi-user repository in Design Manager available, it has historically a file-based tool which integrates directly with configuration management tools. Core to SCM is making sure the tool of choice (e.g. RTC, ClearCase, Synergy) is configured to use the Rational Rhapsody DiffMerge tool. DiffMerge is therefore a separate tool launched independent to Rhapsody that understands Rhapsody projects and how to merge them. Included in this is a very advanced feature known as 3-way merge.

This video shows the basic operation of the DiffMerge when dealing with parallel changes to the same project and diagrams. Key aspects of this are that the Rhapsody DiffMerge will automatically resolve all trivial parallel changes, leaving the user to deal with changes that are non-trivial, i.e. conflicting or where a user choice is needed. This video illustrates an example where two users change the same diagram.

1 comment:

  1. Hi,

    How do save the merge to existing project itself. For example, i am working in A, and need to integrate changes from B to A.

    As per your example, i need to merger A and B into C and use it. Can't we merge into A itself?