@Deprecated public static class AbstractObjectConflictResolver.MergeLocalChangesPerFeature extends AbstractObjectConflictResolver.ThreeWayMerge
AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector
AbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMerge
ALL, CDO, NONE
Constructor and Description |
---|
AbstractObjectConflictResolver.MergeLocalChangesPerFeature()
Deprecated.
|
Modifier and Type | Method and Description |
---|---|
protected boolean |
hasFeatureConflicts(CDORevisionDelta localDelta,
List<CDORevisionDelta> remoteDeltas)
Deprecated.
|
protected void |
resolveConflict(CDOObject conflict,
CDORevisionDelta localDelta,
List<CDORevisionDelta> remoteDeltas)
Deprecated.
|
hookTransaction, isValid, resolveConflict, resolveConflicts, unhookTransaction
changeObject, readObject, resolveConflict, resolveConflicts, rollbackObject
getTransaction, setTransaction
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
getTransaction, setTransaction
public AbstractObjectConflictResolver.MergeLocalChangesPerFeature()
protected void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)
resolveConflict
in class AbstractObjectConflictResolver.ThreeWayMerge
protected boolean hasFeatureConflicts(CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)
Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.