Package org.eclipse.emf.compare.conflict
-
Interface Summary Interface Description IConflictDetector This class defines the general contract of a Conflict detector. -
Class Summary Class Description DefaultConflictDetector The conflict detector is in charge of refining the Comparison model with all detected Conflict between its differences.MatchBasedConflictDetector This conflict detector searches for conflictingDiffs in the sameMatchas the currentDiff, as well as amongReferenceChanges that reference the sameEObjectas the currentDiff, if it is aReferenceChange.