Sample Data

Input data

The inputsused for the XML Merge samples are HTML files. In case of ConcurentMerge, the first of which is the common ancestor, and the remaining are edits by four different authors.

However, in case of Sequential Merge, each file will be considered as a derivative of the previous file.

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

Sample results

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 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`

Sequential Merge Result Files

These files show 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`