Merge Result Formats and Types

Merge supports five result types that control the level of post-processing applied to the raw merge output.

Result Type	Description	concurrent	concurrent3	sequential
`DELTAV2`	Raw result with no post-processing	✓	✓	✓
`ANALYZED_DELTAV2`	Adds `deltaxml:edit-type` attributes classifying changes as add, delete, or modify	✓	✓	✓
`RULE_PROCESSED_DELTAV2`	Applies default rules to auto-resolve simple add and delete changes	✓	✓	—
`SIMPLIFIED_DELTAV2`	A simplified form of the DeltaV2 format suitable for document editors	✓	✓	✓
`SIMPLIFIED_RULE_PROCESSED_DELTAV2`	Simplified format with simple adds/deletes auto-resolved	✓	✓	—

Three-Way Merge Additional Result Types

When using the concurrent3 merge type, three additional result types are available:

Result Type	Description
`OXYGEN_TRACK_CHANGES`	Produces a merge result with oXygen Author track-change processing instructions
`ALL_CHANGES`	Performs three-to-two simplification, showing as many changes as possible
`CONFLICTING_CHANGES`	Three-to-two simplification, showing conflicts for further resolution; simple non-conflicting changes are auto-resolved
`THEIR_CHANGES`	Three-to-two simplification; changes in the third input are displayed; non-conflicting changes in the second input are auto-resolved

TwoWayResultFormat

For ALL_CHANGES, CONFLICTING_CHANGES, and THEIR_CHANGES result types, the output format can be controlled with the TwoWayResultFormat parameter:

Format	Description
`XML_DELTA`	Produces either a DeltaV2 result or a simplified delta result
`OXYGEN_TRACK_CHANGES`	Produces an XML file with oXygen accept/reject processing instructions

Setting the Result Type

Java API

Java

ConcurrentMerge merge = new ConcurrentMerge();
merge.setResultType(ConcurrentMergeResultType.ANALYZED_DELTAV2);

Command Line

Bash

java -jar deltaxml-merge-x.y.z.jar merge concurrent ResultType=ANALYZED_DELTAV2 \
  ancestor ancestor.xml anna anna.xml ben ben.xml result.xml