E
- the type of element used in the merge operation.@Unstable
public interface ConflictDecision<E>
Conflict
.Modifier and Type | Interface and Description |
---|---|
static class |
ConflictDecision.DecisionType
The decision made for this conflict.
|
Modifier and Type | Method and Description |
---|---|
Chunk<E> |
getChunk() |
Conflict<E> |
getConflict() |
ConflictDecision.DecisionType |
getType() |
void |
setCustom(List<E> chunkElement)
Allow to specify a custom chunk.
|
void |
setType(ConflictDecision.DecisionType type) |
void setType(ConflictDecision.DecisionType type)
type
- the decision made for this conflict.void setCustom(List<E> chunkElement)
ConflictDecision.DecisionType.CUSTOM
.chunkElement
- the custom chunk to set for this decision.ConflictDecision.DecisionType getType()
Chunk<E> getChunk()
ConflictDecision.DecisionType
for more information.Copyright © 2004–2019 XWiki. All rights reserved.