Samples and Guides
Samples
Name | Description | Concurrent Merge | Sequential Merge |
|---|---|---|---|
This page links to each of the inputs used in the Merge sample and also links to files for each of the result types. | ✔ | ✔ | |
This sample provides a basic demonstration on how to run a simple merge using the Java API. | ✔ | ✔ | |
This sample shows how configuration files can be used to extend the internal catalogs for DTD caching. | ✔ | ✔ | |
This sample shows how to handle formatting elements. | ✔ | ✔ | |
This sample aims to demonstrate the behaviour of formatting elements when rule processing is enabled. | ✔ | ||
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'. | ✔ | ||
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. | ✔ | ||
This sample allows merge to be used as a git merge-tool. This sample supports Unix systems including macOS and Linux. | ✔ |
Guides
Name | Description | Concurrent Merge | Sequential Merge |
|---|---|---|---|
This guide provides details on the purpose of the analyzed deltaV2 output and describes how to configure Concurrent Merge to produce this result type. | ✔ | ||
This guide provides details on the purpose of the analyzed deltaV2 output and describes how to configure Sequential Merge to produce this result type. | ✔ | ||
This guide provides an overview of the different merge result formats and types. | ✔ | ✔ | |
This guide describes different formatting element representations. | ✔ | ✔ | |
Guide for table processing. | ✔ | ✔ | |
This guide describes how to configure XML Merge to apply automatic rules to the merge result in order to programatically process specific changes. | ✔ | ||
This guide explains three to two merge process. | ✔ |