Three-to-two Merge Concepts
The Three-to-Two Merge converts a three-way DeltaV2 merge result into a simplified two-way change-tracking representation. This simplified format is compatible with document editors that support standard change tracking (accept/reject), such as oXygen XML Author.
The Problem
A three-way merge involving an ancestor and two edited versions produces a DeltaV2 output with multiple version identifiers per node. This format is rich but complex and document editors cannot natively display it as simple tracked changes.
The Solution
The Three-to-Two Merge simplifies the output by:
-
Auto-resolving non-conflicting changes (one editor changed content, the other did not).
-
Representing remaining conflicts as simple two-way tracked changes.
-
Producing output in a format compatible with standard XML change-tracking interfaces.
Result Types
When using concurrent3 merge type with three-to-two simplification:
|
Result Type |
Description |
|---|---|
|
|
Shows all changes as tracked changes; auto-resolves unambiguous non-conflicting edits |
|
|
Shows only conflicts as tracked changes; auto-resolves all non-conflicting changes |
|
|
Shows conflicts and changes from the 'their' (remote) branch; auto-resolves local non-conflicting changes |
TwoWayResultFormat Options
|
Format |
Description |
|---|---|
|
|
Standard DeltaV2 or simplified delta output |
|
|
oXygen XML editor accept/reject format with processing instructions |