Skip to content

Views of Merged Versions

Each view of the merged versions illustrates specific changes within a context, highlights the reconciliation problems, and helps you solve them. For example:

Which parts of the base code have been changed and by which derivative?

  • The M+R primary command "eXclude BAse" creates a view that contains only those base records that have been changed. It points out, graphically and in color, which derivative has made what kind of changes.

Which parts of the base code have been changed by a particular derivative?

  • The M+R primary command "View ID" creates a view that highlights only the changes made by the derivative with that ID.

Which parts of the base code have been changed by a combination of two or more derivatives?

  • The M+R pair of primary commands "eXclude ID" and "Reset ID" generate views containing only the changes made by the derivatives which are not excluded.

How does the consolidation look at this stage?

  • M+R automatically applies the single (made by one derivative only) changes to the base code, and then presents the current state of the consolidated file in response to a primary command "View REmaining".

Which lines of base code are changed by more than one derivative?

  • Such records are in conflict and are the prime target of reconciliation. The M+R primary command "View COnflicts" provides a view where you can delete, move, or otherwise manipulate the code to resolve the conflicts.