Interface | Description |
---|---|
IConflictDetector |
This class defines the general contract of a Conflict detector.
|
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 conflicting
Diff s in the same Match as the current
Diff , as well as among ReferenceChange s that reference the same EObject as the
current Diff , if it is a ReferenceChange . |
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.