Conflict handling in interactive merge

If you transformed a business model into a BPMN diagram, and if the BPMN diagram was improved or technical details were added, these changes need to be included in a new transformation.

Also, if the business model has been changed, the changes should not be lost in the BPMN diagram. This means that you need to make a decision on how to proceed. Users are supported in making that decision so that they do not need to track each change.

The following graphic illustrates such a situation:

Interactive merge - Initial situation

The original source model was transformed to BPMN (top part of the graphic). Both the business model and the BPMN diagram have been edited.

In the business model, an XOR rule was modeled from the F1 function, and another function F3 was modeled that is carried out by the organizational unit Alice. Therefore, there are two end events now instead of one (End1 and End2).

In the BPMN diagram, the task F2b was added between the task F2 and the end event End in the Alice lane.

The business model is to be transformed again. However, since the changes in the BPMN diagram must not be lost, the target model for this new transformation is the model resulting from the first transformation. An interactive merge is performed.

The following graphic illustrates the so-called conflict model:

Interactive merge - Conflict model

Changes are indicated by the following symbols in the model.

Symbol

Meaning

Added

Added by the transformation

Removed

Deleted by the transformation

added to target

Added to target model

In the upper example, the objects F3 and End 2 and the XOR rule added to the edited source model, as well as all connections from and to these objects are marked as Added by the transformation (Added).

The connection between object F1 and object F2 that existed in the original source model, but that was deleted during the source model change is marked as Deleted by the transformation in the conflict model (Removed).

The task F2b added in the BPMN diagram and its incoming and outgoing connections are marked as Added to target model in the conflict model (added to target).

The connection from task F2 to end event End is also marked as Added by the transformation even though it was actually deleted in the BPMN diagram in order to insert F2b. However, these two are indistinguishable and are always marked as Added by the transformation.

You can decide for each conflict whether you want to accept or discard it. For example, a conflict with only one object having been added is considered to be a simple conflict.

There are, however, groups of simple conflicts that should be either all accepted or all discarded. These are called complex conflicts.

See also

What will be displayed after an interactive merge?

What will be displayed when aligning models?