public static class DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict extends DefaultCDOMerger.Conflict
Constructor and Description |
---|
ChangedInTargetAndDetachedInSourceConflict(CDORevisionDelta targetDelta) |
Modifier and Type | Method and Description |
---|---|
CDOID |
getID() |
CDORevisionDelta |
getTargetDelta() |
String |
toString() |
public ChangedInTargetAndDetachedInSourceConflict(CDORevisionDelta targetDelta)
public CDOID getID()
getID
in class DefaultCDOMerger.Conflict
public CDORevisionDelta getTargetDelta()
Copyright (c) 2011-2015 Eike Stepper (Berlin, Germany) and others.