|
Generated by JDiff |
|||||||
| PREV PACKAGE NEXT PACKAGE FRAMES NO FRAMES | DETAIL: REMOVED | ADDED | CHANGED | |||||||
| Added Classes and Interfaces | |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
A {@code ThreeWayConflictHandler} is responsible for handling conflicts which happen on org.apache.jackrabbit.oak.api.Root.rebase() and on the implicit rebase operation which takes part on org.apache.jackrabbit.oak.api.Root.commit(). |
|
Resolution |
Resolutions for conflicts |
|
|
Dynamic EditorProvider based on the available whiteboard services. |
| Changed Classes and Interfaces | |
|
|
A {@code CompositeConflictHandler} delegates conflict handling to multiple backing handlers. |
|
|
A {@code ConflictHandler} is responsible for handling conflicts which happen on org.apache.jackrabbit.oak.api.Root.rebase() and on the implicit rebase operation which takes part on org.apache.jackrabbit.oak.api.Root.commit(). |
|
|
A {@code PartialConflictHandler} is responsible for handling conflicts which happen on org.apache.jackrabbit.oak.api.Root.rebase() and on the implicit rebase operation which takes part on org.apache.jackrabbit.oak.api.Root.commit(). |
|
|
This {@code Editor} instance logs invocations to the logger passed to its constructor after each 10000 calls to it {@code enter()} method. |
|
||||||||
| PREV PACKAGE NEXT PACKAGE FRAMES NO FRAMES | ||||||||