Fig. 4

Conflict detection and resolution. (top) two nodes are created to generate a conflict. The two nodes locally assign a different value to the same parameter k1. (bottom left) Once the third node M is created as child of both WT1 and WT2 JC-RM detects the conflict in assigning a value to k1 in M and displays the problem as dashed connecting arrows in the graph. (bottom right) Checking the content of the M node, the conflict in the specific value of k1 is clearly marked. Three options are presented for resolving the conflict: a pick a value from a specific parent, b pick the value from the base set or c assign a new value from a typed expression. The algebraic expression can contain references to ancestor nodes