Merge Overview
Merge allows you to easily manage the complexities that arise when multiple authors work, either concurrently or sequentially, on the same document.
What Can Merge Do?
Merge takes two or more files and merges the changes that have been made into a single file. It aligns content, identifies potential conflicts, and shows differences in the output.
There are two broad scenarios:
-
Concurrent merge is useful when there is one ancestor document that has been amended by a number of editors concurrently.
-
Sequential merge is useful in a scenario in which each of the versions is a derivative of the previous version.
A common use case for Merge is to merge two variants of a file. A variety of output types are provided to support this case. These outputs include optional resolution of the complex three-way changes into a simpler two-way representation familiar to users of change tracking in document editors.
Supported formats
Currently, Merge supports any type of XML along with a specialized pipeline for DITA topics and maps.
Merge Result Formats and Types
Before using Merge, you need to understand the different types of results and when to use them. The Merge Result Format and Types section summarizes the result types and their differences and offers advice as to which may be appropriate for different user requirements and use cases.
Related Topics
To learn more about Merge and its features, visit [merge guides].