This package provides classes for Merging of DITA inputs.
This package is used to define the interfaces and classes that are common to all of the merge products.
This package provides configuration classes for merge.
A package for n-way merging of DITA content.
The ConcurrentMerge class supports a model of merging where there is a common ancestor and a number of derivative versions or 'edits'. Changes between the ancestor and edits are represented using the deltaV2 format (attributes and elements in a DeltaXML namespace) as used in other products such as XML Compare.
The package supports generating a result which contains all of the content from all of the inputs. Because the concurrent merge algorithm has the concept of an ancestor version it is possible to define changes in terms of concepts such as 'add', 'delete' and 'modify' and this information can also be annotated in the result. It's also possible to perform rule-based processing on the result so that simple, non-conflicting, changes can be automatically processed.
To resolve conflicting changes we recommend and propose the use of an interactive or GUI based conflict resolver. While these resolvers are not included in the DITA Merge product, several prototype or demonstration applications are available on the DeltaXML website.
Copyright © 2015 - 2019 DeltaXML Ltd. All Rights Reserved.