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

Interface Summary

Interface	Description
CustomConflictOptionFactory	Interface for extension point.

Class Summary

Class	Description
ConflictContext	Holding the data for the context of an conflict.
ConflictDescription	Container for the conflict description.
ConflictOption	This class represents an option/solution for a conflict.
CustomConflictOption	Abstract superclass for custom options.
Messages	Conflict options related messages.
VisualConflict	Main class representing a conflict.

Enum Summary

Enum	Description
ConflictOption.OptionType	Type of options.