Interface | Description |
---|---|
ConflictContainer | |
ConflictStrategy |
Class | Description |
---|---|
AddAddConflictStrategy |
this class handles the following conflicts Add-Add
|
AddChangeConflictStrategy | |
AddDeleteConflictStrategy |
this class handles the following conflicts Add-Delete (direct or indirect)
|
ChangeChangeConflictStrategy |
this class handles the following conflicts Change-Change
|
ChangeDeleteConflictStrategy |
this class handles the following conflicts Change-Delete (direct or indirect)
|
ChangeMoveConflictStrategy | |
ConflictAnalyzer | |
ConflictStrategyImpl | |
ConflictStrategyRegistry | |
DeleteDeleteConflictStrategy |
this class handles the following conflicts Delete-Delete (direct or indirect)
|
JoinDeleteConflictStrategy | |
JoinJoinConflictStrategy | |
MorphConflictStrategy | |
MoveDeleteConflictStrategy |
this class handles the following conflicts Move-Delete (Direct or Indirect)
|
MoveMoveConflictStrategy |
this class handles the following conflicts Move-Move
|
SeparationDeleteConflictStrategy | |
SeparationSeparationConflictStrategy |