Package | Description |
---|---|
org.eclipse.emf.spi.cdo |
Client service provider interfaces and useful base implementations.
|
Modifier and Type | Class and Description |
---|---|
class |
AbstractChangeSetsConflictResolver
If the meaning of this type isn't clear, there really should be more of a description here...
|
class |
AbstractObjectConflictResolver
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
AbstractObjectConflictResolver.MergeLocalChangesPerFeature
Deprecated.
As of 4.0 use CDOMergingConflictResolver
|
static class |
AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges
Deprecated.
|
static class |
AbstractObjectConflictResolver.ThreeWayMerge
If the meaning of this type isn't clear, there really should be more of a description here...
|
class |
CDOMergingConflictResolver
If the meaning of this type isn't clear, there really should be more of a description here...
|
Copyright (c) 2014 Eike Stepper (Berlin, 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