oracle.javatools.compare

Interface CompareMergeAlgorithm

All Superinterfaces:

CompareAlgorithm

public interface CompareMergeAlgorithm
extends CompareAlgorithm

An algorithm capable of merging two contributors and returning a model of conflicting differences.

Since:

11.1.1.0.0

Method Summary

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.

Methods inherited from interface oracle.javatools.compare.CompareAlgorithm

canCompare, compare

Method Detail

merge

CompareModel merge(CompareContributor first,
                   CompareContributor second,
                   CompareContributor ancestor)
            throws CompareFailedException

Merge two contributors based on a third, returning a model of the conflicting differences between the two.

Parameters:

first - the first contributor

second - the second contributor

ancestor - the ancestor contributor

Returns:

a model of the conflicting differences between the two contributors.

Throws:

CompareFailedException - if the two contributors could not be merged because of an error.