# Uses of Class
org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver

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

## Uses of AbstractObjectConflictResolver in org.eclipse.emf.spi.cdo

Subclasses of AbstractObjectConflictResolver in org.eclipse.emf.spi.cdo
Modifier and Type
Class
Description
`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...