Class ConcurrentMerge

java.lang.Object
com.deltaxml.merge.ConcurrentMerge
All Implemented Interfaces:
MergeBase, MergeCommon

public class ConcurrentMerge extends Object implements MergeCommon

A merge class which supports n-way merging of the concurrently edited XML content (data or documents) .

The term concurrent describes a scenario in which the ancestor version is known to be the original version from which the other versions are derived and therefore precedes them in time. The other versions that are merged are treated symmetrically as if they had no temporal or other relationship (such a derivation) between each other. To perform a merge where each of the versions added to the merge is a derivative of the previous version use SequentialMerge.

An alternative class ThreeWayMerge is provided with similar capabilities for the common three way use case, but which also provides a number of additional output types/formats.

Since:
4.0