## Uses of Interface
org.eclipse.emf.cdo.transaction.CDOConflictResolver2

- Packages that use CDOConflictResolver2
  Package | Description
  --- | ---
  org.eclipse.emf.spi.cdo | Client service provider interfaces and useful base implementations.

- - ### Uses of CDOConflictResolver2 in org.eclipse.emf.spi.cdo

    Classes in org.eclipse.emf.spi.cdo that implement CDOConflictResolver2
    Modifier and Type | Class | Description
    --- | --- | ---
    `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...