Samples and Guides

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.

✔

✔

Java API Sample

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

✔

✔

Configuration File Sample

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

✔

✔

Formatting Elements Sample

This sample shows how to handle formatting elements.

✔

✔

Formatting Elements with Rule Processing

This sample aims to demonstrate the behaviour of formatting elements when rule processing is enabled.

✔

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

✔

Integration with Mercurial

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.

✔

Integration with Git

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

✔

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.

✔

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.

✔

Merge Result Formats and Types

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

✔

✔

Formatting Element Representations

This guide describes different formatting element representations.

✔

✔

Merging tables

Guide for table processing.

✔

✔

Rule Based Processing

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

✔

Three To Two Merge

This guide explains three to two merge process.

✔