Composite-Level Conflict Detection in UML Model Versioning

Table 1

Definition of composite operations by suboperations.

Composite operation	Sequence of suboperations
MoveField(, )	,; = AddField(, ),; = DeleteField()
PullUpField(, ),; .children =	,; = MoveField(, ),; = DeleteField(),
PushDownField(, ),; .children =	,; = MoveField(, ),; = AddField(, ),