LSPS documentation logo
LSPS Documentation
Comparing Resources

You can compare the resources you create in Designer with a dedicated Comparing tool that visualizes the detected differences and allows you to merge the differences among the compared resources. It detects changes with semantic significance, such as, a removed task, as well as other changes, such as changes in element layout, size, etc.

You can compare two or three resources of the same type, and that, projects, modules, or configurations and definitions.

Comparing Two Resources

To compare two resources, do the following:

  1. Select the resources (Ctrl + left-click to select) in the GO-BPMN Explorer.
  2. Right-click one of the selected resources and click Compare With > Each Other.

    When comparing Modules or projects, you will see the files with detected differences. To display the differences on the files, click the file: in the displayed diff, use the buttons in the toolbar to navigate through the differences.

    comparisoneditortwoway.png
    Comparing goal-based Processes
  3. To apply a difference on either resource, right-click the difference and select the required action from the context menu.
diffingResolvingTwo.png
Resolving difference
To switch from the LSPS Compare to a text compare, click the arrow on top of the comparison table and click Text Compare.

Diff-CompareToolSelect.png

Comparing Three Resources

To compare three resources, do the following:

  1. In the GO-BPMN Explorer, select three resources of the same type.
  2. Right-click one of the selected resources, and select Compare With > Each Other.
  3. In the Select Common Ancestor dialog box, select the common ancestor, the original resource, and click OK.

    When comparing three resources, the following takes place:

    • The ancestor resource and the first modification are compared.
    • The ancestor and the second modification are compared.
    • Results of both previous comparisons are compared and visualized in the table of the Comparison Editor.
      ComparingModules3.png
      Defining the ancestor resource
      When comparing Modules or projects, the editor will display files with differences. To display the differences, click the file.

    Note that changes that are not in either of the resources are marked with while identical changes are marked with .

  4. Merge required changes into the respective modifications (You cannot merge a difference into the ancestor resource).
    comparisoneditorthreeway.png
    Comparing three resources
    To switch from the LSPS Compare to a text compare, click the arrow on top of the comparison table and click Text Compare.
    Diff-CompareToolSelect.png
    Marker Description
    The left modification adds an element to the ancestor. This change is not in conflict with those ones in the right modification.
    The left modification removes an element from the ancestor. This change is not in conflict with those ones in the right modification.
    The left modification updates an element of the ancestor. This change is not in conflict with those ones in the right modification.
    The left modification adds an element to the ancestor. However, this change is in conflict with those ones in the right modification.
    The left modification removes an element from the ancestor. However, this change is in conflict with those ones in the right modification.
    The left modification updates an element of the ancestor. However, this change is in conflict with those ones in the right modification.
    The right modification adds an element to the ancestor. This change is not in conflict with those ones in the left modification.
    The right modification removes an element from the ancestor. This change is not in conflict with those ones in the left modification.
    The right modification updates an element of the ancestor. This change is not in conflict with those ones in the left modification.
    The right modification adds an element to the ancestor. However, this change is in conflict with those ones in the left modification.
    The right modification removes an element from the ancestor. However, this change is in conflict with those ones in the left modification.
    The right modification updates an element of the ancestor. However, this change is in conflict with those ones in the left modification.

Comparing Version-Controlled Resources

The comparing procedure can vary depending on your version control system. Generally, do the following to compare local changes with the current resource version:

  1. In the GO-BPMN Explorer, select the resource.
  2. Click Compare With -> Latest from Repository.
  3. Synchronize your changes with the Repository if applicable: Right-click the resource and select Team -> Synchronize with Repository.

Merging

You can merge the differences in diagram resources just like you would when comparing resources in the Comparison Editor: You may accept or reject the detected differences from any of the resources (baseline or modifications) to create the required merge result. The Comparison Editor is activated and contains comparison results automatically.

A yellow indicator appears on the side when a difference has been merged into one of the resources.