Class | Description |
---|---|
AnnotatingConflictHandler |
This
ConflictHandler implementation resolves conflicts to
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.
|
ConflictHandlerWrapper |
This
ConflictHandler implementation wraps another conflict handler
and forwards all calls to the wrapped handler. |
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.
|
MergingNodeStateDiff |
MergingNodeStateDiff...
|
"Copyright © 2006 - 2015 Adobe Systems Incorporated. All Rights Reserved"