Samples and Guides

 Table of Contents

Samples

All Merge Types

Sample 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.

View

Java API Sample

This sample provides a basic demonstration on how to run a simple merge using the Java API.

View

Configuration File Sample

This sample shows how configuration files can be used to extend the internal catalogs for DTD caching.

View

Concurent Merge Specific

Three To Two Merge Use Cases

This sample 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'.

View

Mercurial Plugin Sample

This sample demonstrates how XML Merge can be used in conjunction with Mercurial merge and graft operations. This sample supports Unix systems including MacOS and Linux.

View

Git Plugin Sample

This sample allows merge to be used as a git merge-tool. This sample supports Unix systems including MacOS and Linux.

View

Guides

All Merge Types

Merge Result Formats

This guide provides an overview of the different merge result formats and types.

View

Merging tables

Guide for table processing

View

Concurent Merge Specific

Concurrent Merge Analysis

This guide provides details on the purpose of the analyzed deltaV2 output and describes how to configure Concurrent Merge to produce this result type.

View

Rule Based Processing

This guide describes how to configure DITA Merge to apply automatic rules to the merge result in order to programatically process specific changes.

View

Sequential Merge Specific

Sequential Merge Analysis

This guide provides details on the purpose of the analyzed deltaV2 output and describes how to configure Sequential Merge to produce this result type.

View

#content .code