Package org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging

Interface Summary

Interface	Description
ConflictHandler	Allows to hook in for custom conflict treatment.
ConflictResolver	Represents a controller that can merge conflicting changes resulting in a list of changes that is not conflicting any more.

Class Summary

Class	Description
AbstractConflictResolver	Convenience super class for implementing ConflictResolver.
DecisionManager	DecisionManager is the controller for the merge dialog and therefore it's main component.
Messages	Merging related messages.