Uses of Class
org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.Resolution

Packages that use ThreeWayConflictHandler.Resolution

Package	Description
org.apache.jackrabbit.oak.spi.commit

Uses of ThreeWayConflictHandler.Resolution in org.apache.jackrabbit.oak.spi.commit

Methods in org.apache.jackrabbit.oak.spi.commit that return ThreeWayConflictHandler.Resolution

Modifier and Type	Method	Description
@NotNull ThreeWayConflictHandler.Resolution	CompositeConflictHandler.addExistingNode(@NotNull NodeBuilder parent, @NotNull java.lang.String name, @NotNull NodeState ours, @NotNull NodeState theirs)
@NotNull ThreeWayConflictHandler.Resolution	ThreeWayConflictHandler.addExistingNode(@NotNull NodeBuilder parent, @NotNull java.lang.String name, @NotNull NodeState ours, @NotNull NodeState theirs)	The node ours has been added to parent which conflicts with node theirs which has been added in the persistence store.
@NotNull ThreeWayConflictHandler.Resolution	CompositeConflictHandler.addExistingProperty(@NotNull NodeBuilder parent, @NotNull org.apache.jackrabbit.oak.api.PropertyState ours, @NotNull org.apache.jackrabbit.oak.api.PropertyState theirs)
@NotNull ThreeWayConflictHandler.Resolution	ThreeWayConflictHandler.addExistingProperty(@NotNull NodeBuilder parent, @NotNull org.apache.jackrabbit.oak.api.PropertyState ours, @NotNull org.apache.jackrabbit.oak.api.PropertyState theirs)	The property ours has been added to parent which conflicts with property theirs which has been added in the persistence store.
@NotNull ThreeWayConflictHandler.Resolution	CompositeConflictHandler.changeChangedProperty(@NotNull NodeBuilder parent, @NotNull org.apache.jackrabbit.oak.api.PropertyState ours, @NotNull org.apache.jackrabbit.oak.api.PropertyState theirs, @NotNull org.apache.jackrabbit.oak.api.PropertyState base)
@NotNull ThreeWayConflictHandler.Resolution	ThreeWayConflictHandler.changeChangedProperty(@NotNull NodeBuilder parent, @NotNull org.apache.jackrabbit.oak.api.PropertyState ours, @NotNull org.apache.jackrabbit.oak.api.PropertyState theirs, @NotNull org.apache.jackrabbit.oak.api.PropertyState base)	The property ours has been changed in parent while it was also changed to a different value (theirs) in the persistence store.
@NotNull ThreeWayConflictHandler.Resolution	CompositeConflictHandler.changeDeletedNode(@NotNull NodeBuilder parent, @NotNull java.lang.String name, @NotNull NodeState ours, @NotNull NodeState base)
@NotNull ThreeWayConflictHandler.Resolution	ThreeWayConflictHandler.changeDeletedNode(@NotNull NodeBuilder parent, @NotNull java.lang.String name, @NotNull NodeState ours, @NotNull NodeState base)	The node ours has been changed in parent while it was removed in the persistence store.
@NotNull ThreeWayConflictHandler.Resolution	CompositeConflictHandler.changeDeletedProperty(@NotNull NodeBuilder parent, @NotNull org.apache.jackrabbit.oak.api.PropertyState ours, @NotNull org.apache.jackrabbit.oak.api.PropertyState base)
@NotNull ThreeWayConflictHandler.Resolution	ThreeWayConflictHandler.changeDeletedProperty(@NotNull NodeBuilder parent, @NotNull org.apache.jackrabbit.oak.api.PropertyState ours, @NotNull org.apache.jackrabbit.oak.api.PropertyState base)	The property ours has been changed in parent while it was removed in the persistence store.
@NotNull ThreeWayConflictHandler.Resolution	CompositeConflictHandler.deleteChangedNode(@NotNull NodeBuilder parent, @NotNull java.lang.String name, @NotNull NodeState theirs, @NotNull NodeState base)
@NotNull ThreeWayConflictHandler.Resolution	ThreeWayConflictHandler.deleteChangedNode(@NotNull NodeBuilder parent, @NotNull java.lang.String name, @NotNull NodeState theirs, @NotNull NodeState base)	The node theirs changed in the persistence store while it has been deleted locally.
@NotNull ThreeWayConflictHandler.Resolution	CompositeConflictHandler.deleteChangedProperty(@NotNull NodeBuilder parent, @NotNull org.apache.jackrabbit.oak.api.PropertyState theirs, @NotNull org.apache.jackrabbit.oak.api.PropertyState base)
@NotNull ThreeWayConflictHandler.Resolution	ThreeWayConflictHandler.deleteChangedProperty(@NotNull NodeBuilder parent, @NotNull org.apache.jackrabbit.oak.api.PropertyState theirs, @NotNull org.apache.jackrabbit.oak.api.PropertyState base)	The property theirs changed in the persistence store while it has been deleted locally.
@NotNull ThreeWayConflictHandler.Resolution	CompositeConflictHandler.deleteDeletedNode(@NotNull NodeBuilder parent, @NotNull java.lang.String name, @NotNull NodeState base)
@NotNull ThreeWayConflictHandler.Resolution	ThreeWayConflictHandler.deleteDeletedNode(@NotNull NodeBuilder parent, @NotNull java.lang.String name, @NotNull NodeState base)	The node name has been removed in parent while it was also removed in the persistence store.
@NotNull ThreeWayConflictHandler.Resolution	CompositeConflictHandler.deleteDeletedProperty(@NotNull NodeBuilder parent, @NotNull org.apache.jackrabbit.oak.api.PropertyState base)
@NotNull ThreeWayConflictHandler.Resolution	ThreeWayConflictHandler.deleteDeletedProperty(@NotNull NodeBuilder parent, @NotNull org.apache.jackrabbit.oak.api.PropertyState base)	The property ours has been removed in parent while it was also removed in the persistence store.
static ThreeWayConflictHandler.Resolution	ThreeWayConflictHandler.Resolution.valueOf(java.lang.String name)	Returns the enum constant of this type with the specified name.
static ThreeWayConflictHandler.Resolution[]	ThreeWayConflictHandler.Resolution.values()	Returns an array containing the constants of this enum type, in the order they are declared.