Package org.eclipse.emf.spi.cdo
Class DefaultCDOMerger.Conflict
java.lang.Object
org.eclipse.emf.spi.cdo.DefaultCDOMerger.Conflict
- Direct Known Subclasses:
DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict,DefaultCDOMerger.ChangedInSourceAndTargetConflict,DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict
- Enclosing class:
DefaultCDOMerger
Describes an unresolved change-set conflict for one object ID. The concrete conflict types capture the incompatible
target and source histories so a
CDOMerger client can inspect why the merge could not produce a result.- Author:
- Eike Stepper
-
Constructor Summary
Constructors -
Method Summary
-
Constructor Details
-
Conflict
public Conflict()
-
-
Method Details
-
getID
-