java.lang.Object
- org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler

All Implemented Interfaces:

ThreeWayConflictHandler
```
public class AnnotatingConflictHandler
extends Object
implements ThreeWayConflictHandler
```
This ThreeWayConflictHandler implementation resolves conflicts to ThreeWayConflictHandler.Resolution.THEIRS and in addition marks nodes where a conflict occurred with the mixin rep:MergeConflict:
```
 [rep:MergeConflict]
   mixin
   primaryitem rep:ours
   + rep:ours (rep:Unstructured) protected IGNORE
 
```
The rep:ours sub node contains our version of the node prior to the conflict.
See Also:

ConflictValidator

Nested Class Summary
- Nested classes/interfaces inherited from interface org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler
  ThreeWayConflictHandler.Resolution

Constructor Summary

Constructors
Constructor Description

AnnotatingConflictHandler()

Method Summary

All Methods Instance Methods Concrete Methods
Modifier and Type	Method	Description
`@NotNull ThreeWayConflictHandler.Resolution`	`addExistingNode(@NotNull NodeBuilder parent, @NotNull 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`	`addExistingProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours, @NotNull 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`	`changeChangedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours, @NotNull PropertyState theirs, @NotNull 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`	`changeDeletedNode(@NotNull NodeBuilder parent, @NotNull 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`	`changeDeletedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours, @NotNull PropertyState base)`	The property `ours` has been changed in `parent` while it was removed in the persistence store.
`@NotNull ThreeWayConflictHandler.Resolution`	`deleteChangedNode(@NotNull NodeBuilder parent, @NotNull 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`	`deleteChangedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState theirs, @NotNull PropertyState base)`	The property `theirs` changed in the persistence store while it has been deleted locally.
`@NotNull ThreeWayConflictHandler.Resolution`	`deleteDeletedNode(@NotNull NodeBuilder parent, @NotNull 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`	`deleteDeletedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState base)`	The property `ours` has been removed in `parent` while it was also removed in the persistence store.

Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail
- AnnotatingConflictHandler
```
public AnnotatingConflictHandler()
```