MergeResult (XWiki Commons - Diff API 14.10.7 API)

Type Parameters:

E - the type of compared elements
```
public interface MergeResult<E>
```
Version:

$Id: e41d5b7feaa58cca3e1c60e6d38f127da1eadb33 $

Method Summary

All Methods Instance Methods Abstract Methods Default Methods
Modifier and Type	Method	Description
`List<E>`	`getCommonAncestor()`
`default List<Conflict<E>>`	`getConflicts()`
`List<E>`	`getCurrent()`
`LogQueue`	`getLog()`
`List<E>`	`getMerged()`
`List<E>`	`getNext()`

- Method Detail
  - getCommonAncestor
```
List<E> getCommonAncestor()
```
    Returns:
    
    the common ancestor
  - getNext
```
List<E> getNext()
```
    Returns:
    
    the new version
  - getCurrent
```
List<E> getCurrent()
```
    Returns:
    
    the current version
  - getLog
```
LogQueue getLog()
```
    Returns:
    
    the log of what append during the merge execution
  - getMerged
```
List<E> getMerged()
```
    Returns:
    
    the result of the 3 ways merge
  - getConflicts
```
default List<Conflict<E>> getConflicts()
```
    Returns:
    
    the list of conflicts obtained during the merge
    
    Since:
    
    11.7RC1