Samples and Guides

Samples

These are code samples, available through Bitbucket, with a page here explaining the concept behind each sample.

NameDescriptionConcurrent MergeSequential Merge

Sample Input Data

This page links to each of the inputs used in the Merge sample and also links to files for each of the result types.

Java API Sample

Provides a basic demonstration on how to run a simple merge using the Java API.

Configuration File Sample

Shows how configuration files can be used to extend the internal catalogs for DTD caching.

Formatting Elements Sample

Shows how to handle formatting elements.
Formatting Elements with Rule ProcessingDemonstrates the behaviour of formatting elements when rule processing is enabled.

Three To Two Merge Use Cases

Shows how a three-way merge can be simplified to a two-way result with different options to show 'all changes', 'conflicting changes' or 'their changes'.

Integration with Mercurial

Demonstrates how DITA Merge can be used in conjunction with Mercurial merge and graft operations. This sample supports Unix systems including macOS and Linux.

Integration with Git

Shows how DITA Merge can be configured to be used as a git merge-tool. This sample supports Unix systems including macOS and Linux.

Guides

Guides to various features of DITA Merge.

NameDescriptionConcurrent MergeSequential Merge
Concurrent Merge AnalysisProvides details on the purpose of the analyzed deltaV2 output and describes how to configure Concurrent Merge to produce this result type.
Sequential Merge AnalysisProvides details on the purpose of the analyzed deltaV2 output and describes how to configure Sequential Merge to produce this result type.

DITA Merge Result Formats and Types

An overview of the different merge result formats and types.
Formatting Element RepresentationsDescribes different formatting element representations.
Merging TablesA Guide to DITA Merge features that are specific to CALS table and DITA simple table processing.
Rule-Based ProcessingDescribes how to configure DITA Merge to apply automatic rules to the merge result in order to programatically process specific changes.
Three To Two Merge GuideExplains the three to two merge process.


#content .code