@Deprecated public static class AbstractObjectConflictResolver.MergeLocalChangesPerFeature extends AbstractObjectConflictResolver.ThreeWayMerge
AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollectorAbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMergeCDOConflictResolver.NonConflictAwareALL, CDO, NONE| Constructor and Description |
|---|
MergeLocalChangesPerFeature()
Deprecated.
|
| Modifier and Type | Method and Description |
|---|---|
protected boolean |
hasFeatureConflicts(CDORevisionDelta localDelta,
java.util.List<CDORevisionDelta> remoteDeltas)
Deprecated.
|
protected void |
resolveConflict(CDOObject conflict,
CDORevisionDelta localDelta,
java.util.List<CDORevisionDelta> remoteDeltas)
Deprecated.
|
hookTransaction, isValid, resolveConflict, resolveConflicts, unhookTransactionchangeObject, readObject, resolveConflict, resolveConflicts, rollbackObjectgetTransaction, setTransactionclone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, waitgetTransaction, setTransactionprotected void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, java.util.List<CDORevisionDelta> remoteDeltas)
resolveConflict in class AbstractObjectConflictResolver.ThreeWayMergeprotected boolean hasFeatureConflicts(CDORevisionDelta localDelta, java.util.List<CDORevisionDelta> remoteDeltas)
Copyright (c) 2004-2019 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html