java.lang.Object
- java.lang.Enum<ConflictType>
- - org.apache.jackrabbit.oak.spi.state.ConflictType

All Implemented Interfaces:

Serializable, Comparable<ConflictType>
```
public enum ConflictType
extends Enum<ConflictType>
```
Enum to define various types of conflicts.

See Also:

NodeStore.rebase(NodeBuilder)

Enum Constant Summary

Enum Constants
Enum Constant	Description
`ADD_EXISTING_NODE`	A node has been added that is different from a node of them same name that has been added to the trunk.
`ADD_EXISTING_PROPERTY`	A property has been added that has a different value than a property with the same name that has been added in trunk.
`CHANGE_CHANGED_PROPERTY`	A property has been changed while a property of the same name has been changed to a different value in trunk.
`CHANGE_DELETED_NODE`	A node has been changed while a node of the same name has been removed in trunk.
`CHANGE_DELETED_PROPERTY`	A property has been changed while a property of the same name has been removed in trunk.
`DELETE_CHANGED_NODE`	A node has been removed while a node of the same name has been changed in trunk.
`DELETE_CHANGED_PROPERTY`	A property has been removed while a property of the same name has been changed in trunk.
`DELETE_DELETED_NODE`	A node has been removed while a node of the same name has been removed in trunk.
`DELETE_DELETED_PROPERTY`	A property has been removed while a property of the same name has been removed in trunk.

Method Summary

All Methods Static Methods Instance Methods Concrete Methods
Modifier and Type	Method	Description
`boolean`	`effectsNode()`
`static ConflictType`	`fromName(String name)`
`String`	`getName()`
`static ConflictType`	`valueOf(String name)`	Returns the enum constant of this type with the specified name.
`static ConflictType[]`	`values()`	Returns an array containing the constants of this enum type, in the order they are declared.

Methods inherited from class java.lang.Enum
compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf

Methods inherited from class java.lang.Object
getClass, notify, notifyAll, wait, wait, wait

- Enum Constant Detail
  - DELETE_CHANGED_PROPERTY
```
public static final ConflictType DELETE_CHANGED_PROPERTY
```
    A property has been removed while a property of the same name has been changed in trunk.
  - DELETE_CHANGED_NODE
```
public static final ConflictType DELETE_CHANGED_NODE
```
    A node has been removed while a node of the same name has been changed in trunk.
  - ADD_EXISTING_PROPERTY
```
public static final ConflictType ADD_EXISTING_PROPERTY
```
    A property has been added that has a different value than a property with the same name that has been added in trunk.
  - CHANGE_DELETED_PROPERTY
```
public static final ConflictType CHANGE_DELETED_PROPERTY
```
    A property has been changed while a property of the same name has been removed in trunk.
  - CHANGE_CHANGED_PROPERTY
```
public static final ConflictType CHANGE_CHANGED_PROPERTY
```
    A property has been changed while a property of the same name has been changed to a different value in trunk.
  - DELETE_DELETED_PROPERTY
```
public static final ConflictType DELETE_DELETED_PROPERTY
```
    A property has been removed while a property of the same name has been removed in trunk.
  - ADD_EXISTING_NODE
```
public static final ConflictType ADD_EXISTING_NODE
```
    A node has been added that is different from a node of them same name that has been added to the trunk.
  - CHANGE_DELETED_NODE
```
public static final ConflictType CHANGE_DELETED_NODE
```
    A node has been changed while a node of the same name has been removed in trunk.
  - DELETE_DELETED_NODE
```
public static final ConflictType DELETE_DELETED_NODE
```
    A node has been removed while a node of the same name has been removed in trunk.
- Method Detail
  - values
```
public static ConflictType[] values()
```
    Returns an array containing the constants of this enum type, in the order they are declared. This method may be used to iterate over the constants as follows:
    for (ConflictType c : ConflictType.values()) System.out.println(c);
    Returns:
    
    an array containing the constants of this enum type, in the order they are declared
  - valueOf
```
public static ConflictType valueOf(String name)
```
    Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are not permitted.)
    
    Parameters:
    
    name - the name of the enum constant to be returned.
    
    Returns:
    
    the enum constant with the specified name
    
    Throws:
    
    IllegalArgumentException - if this enum type has no constant with the specified name
    
    NullPointerException - if the argument is null
  - getName
```
public String getName()
```
  - effectsNode
```
public boolean effectsNode()
```
  - fromName
```
public static ConflictType fromName(String name)
```

Enum ConflictType

Enum Constant Summary

Method Summary

Methods inherited from class java.lang.Enum

Methods inherited from class java.lang.Object

Enum Constant Detail

DELETE_CHANGED_PROPERTY

DELETE_CHANGED_NODE

ADD_EXISTING_PROPERTY

CHANGE_DELETED_PROPERTY

CHANGE_CHANGED_PROPERTY

DELETE_DELETED_PROPERTY

ADD_EXISTING_NODE

CHANGE_DELETED_NODE

DELETE_DELETED_NODE

Method Detail

values

valueOf

getName

effectsNode

fromName