Package org.apache.jackrabbit.oak.plugins.commit

Class Summary

Class	Description
AnnotatingConflictHandler	This ConflictHandler implementation resolves conflicts to org.apache.jackrabbit.oak.spi.commit.ConflictHandler.Resolution#THEIRS and in addition marks nodes where a conflict occurred with the mixin rep:MergeConflict:
ChildOrderConflictHandler	This conflict handler instance takes care of properly merging conflicts occurring by concurrent reorder operations.
ConflictHook	This commit hook implementation is responsible for resolving conflicts.
ConflictValidator	Validator which checks the presence of conflict markers in the tree in fails the commit if any are found.
ConflictValidatorProvider	TODO document
DefaultConflictHandler	This implementation of a ConflictHandler always returns the same resolution.
JcrConflictHandler	Utility class providing conflict handlers used for JCR.
JcrLastModifiedConflictHandler
MergingNodeStateDiff	MergingNodeStateDiff...