Conflict (XWiki Commons - Diff API 14.10.7 API)

Type Parameters:

E - the type of element used in the merge operation.
```
public interface Conflict<E>
```
Represent a conflict that happened during a merge operation. For more information, see DiffManager.merge(List, List, List, MergeConfiguration).

Since:

11.7RC1

Version:

$Id: d331c79f3fc050f5e7b4c686581fe833b25757be $

Method Summary

All Methods Instance Methods Abstract Methods Default Methods
Modifier and Type	Method	Description
`default boolean`	`concerns(Chunk<E> chunk)`
`default boolean`	`concerns(Delta<E> delta)`
`Delta<E>`	`getDeltaCurrent()`
`Delta<E>`	`getDeltaNext()`
`int`	`getIndex()`
`default int`	`getMaxSize()`	The max size of a conflict is defined by the max size of the current or next chunk size.
`default String`	`getReference()`

- Method Detail
  - getIndex
```
int getIndex()
```
    Returns:
    
    the index where the conflict happened during the merge.
  - getDeltaCurrent
```
Delta<E> getDeltaCurrent()
```
    Returns:
    
    the Delta of the current version of the merge.
  - getDeltaNext
```
Delta<E> getDeltaNext()
```
    Returns:
    
    the Delta of the next version of the merge.
  - concerns
```
default boolean concerns(Delta<E> delta)
```
    Parameters:
    
    delta - the delta that might be concerned by this conflict.
    
    Returns:
    
    true if this conflict might impact the given delta.
    
    Since:
    
    11.8RC1
  - concerns
```
default boolean concerns(Chunk<E> chunk)
```
    Parameters:
    
    chunk - the chunk that might be concerned by this conflict.
    
    Returns:
    
    true if this conflict might impact the given chunk.
    
    Since:
    
    11.8RC1
  - getReference
```
default String getReference()
```
    Returns:
    
    a unique reference for a conflict.
    
    Since:
    
    11.8RC1
  - getMaxSize
```
default int getMaxSize()
```
    The max size of a conflict is defined by the max size of the current or next chunk size.
    
    Returns:
    
    the conflict max size.
    
    Since:
    
    11.8RC1