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

Interface Summary

CustomConflictOptionFactory

Interface for extension point.

Class Summary

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

ConflictOption.OptionType

Type of options.