Sample Input Data

 Table of Contents

1. 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:

FilenamedeltaV2 version identifiers
four-edits.xmlancestor/firstVersion
four-edits-anna.xmlanna
four-edits-ben.xmlben
four-edits-chris.xmlchris
four-edits-david.xmldavid

2. Sample results

2.1. Concurrent Merge Result Files

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

FilenameMergeResultType enumeration value
merge-result-deltav2.xmlDELTAV2
merge-result-analyzed.xmlANALYZED_DELTAV2
merge-result-processed.xmlRULE_PROCESSED_DELTAV2
merge-result-simplified-delta.xmlSIMPLIFIED_DELTAV2
merge-result-simplified-rule-processed-delta.xmlSIMPLIFIED_RULE_PROCESSED_DELTAV2

2.2. 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:

FilenameThreeWayMergeResultType enumeration valueResultFormat enumeration value
result-three-way-oxygen-track-changes.xmlTHREE_WAY_OXYGEN_TRACK_CHANGES-
result-two-way-xml-delta.xmlTWO_WAY_RESULTXML_DELTA
result-two-way-oxygen-track-changes.xmlTWO_WAY_RESULTOXYGEN_TRACK_CHANGES
result-rule-processed-two-way-xml-delta.xmlRULE_PROCESSED_TWO_WAY_RESULTXML_DELTA
result-rule-processed-two-way-oxygen-track-changes.xmlRULE_PROCESSED_TWO_WAY_RESULTOXYGEN_TRACK_CHANGES
result-rule-processed-two-way-dita-markup.xmlRULE_PROCESSED_TWO_WAY_RESULTDITA_MARKUP

2.3. Sequential Merge Result Files

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

FilenameMergeResultType enumeration value
seq-merge-result-deltav2.xmlDELTAV2
seq-merge-result-analyzed.xmlANALYZED_DELTAV2
seq-merge-result-simplified-delta.xmlSIMPLIFIED_DELTAV2
#content .code