Sample Input Data

Input data

The inputs used for the DITA Merge samples are DITA topics and consist of five files. The first of which is the common ancestor, and the remaining are edits by four different authors:

Filename	deltaV2 version identifiers
four-edits.xml	ancestor/firstVersion
four-edits-anna.xml	anna
four-edits-ben.xml	ben
four-edits-chris.xml	chris
four-edits-david.xml	david

Concurrent Merge Result Files

These files show the ConcurrentMerge (n-way) results which are generated for the different 'result type' settings:

Filename	`MergeResultType` enumeration value
merge-result-deltav2.xml	`DELTAV2`
merge-result-analyzed.xml	`ANALYZED_DELTAV2`
merge-result-processed.xml	`RULE_PROCESSED_DELTAV2`
merge-result-simplified-delta.xml	`SIMPLIFIED_DELTAV2`
merge-result-simplified-rule-processed-delta.xml	`SIMPLIFIED_RULE_PROCESSED_DELTAV2`

Three Way Merge Result Files

These files give show the Three Way Merge results which are generated for the different 'result type' and 'format type' settings:

Filename	`ThreeWayMergeResultType` enumeration value	`TwoWayResultFormat` enumeration value
result-three-way-oxygen-track-changes.xml	`THREE_WAY_OXYGEN_TRACK_CHANGES`	`-`
result-two-way-xml-delta.xml	`TWO_WAY_RESULT`	`XML_DELTA`
result-two-way-oxygen-track-changes.xml	`TWO_WAY_RESULT`	`OXYGEN_TRACK_CHANGES`
result-rule-processed-two-way-xml-delta.xml	`RULE_PROCESSED_TWO_WAY_RESULT`	`XML_DELTA`
result-rule-processed-two-way-oxygen-track-changes.xml	`RULE_PROCESSED_TWO_WAY_RESULT`	`OXYGEN_TRACK_CHANGES`
result-rule-processed-two-way-dita-markup.xml	`RULE_PROCESSED_TWO_WAY_RESULT`	`DITA_MARKUP`

Sequential Merge Result Files

These filesshow the SequentialMerge (n-way) results which are generated for the different 'result type' settings:

Filename	`MergeResultType` enumeration value
seq-merge-result-deltav2.xml	`DELTAV2`
seq-merge-result-analyzed.xml	`ANALYZED_DELTAV2`
seq-merge-result-simplified-delta.xml	`SIMPLIFIED_DELTAV2`