public interface CompareMergeAlgorithm extends CompareAlgorithm
Modifier and Type | Method and Description |
---|---|
CompareModel |
merge(CompareContributor first, CompareContributor second, CompareContributor ancestor)
Merge two contributors based on a third, returning a model of the conflicting differences between the two.
|
canCompare, compare
CompareModel merge(CompareContributor first, CompareContributor second, CompareContributor ancestor) throws CompareFailedException
first
- the first contributorsecond
- the second contributorancestor
- the ancestor contributorCompareFailedException
- if the two contributors could not be merged because of an error.