Class ConcurrentMerge

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

public class ConcurrentMerge extends Object implements MergeCommon

A concurrent merge class which supports n-way merging of the concurrently edited DITA documents. Merges two or more edited Darwin Information Typing Architecture (DITA) files with a common ancestor, and produces a DeltaV2 result which can be post-processed to create a merged DITA document.

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 preceeds 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. Future developments may include a merge based on a 'travelling draft' concept where each of the versions added to the merge would be a derivative of the previous version. Such a merge would be 'non-concurrent'.

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.