oXygen Merge Resolver

1. Introduction

An add-on for the oXygen XML Editor provides an interactive merge change viewing and conflict resolution capability. It makes use of the extensible form based controls provided in oXygen's author mode and it can therefore be used with both the oxygen editor and author products.

2. Sample Data

The add-on will take all forms of output generated from the merge API and command-line tools. Please see the Sample Data section for some prepared data that could be used directly with the add-on prior to downloading the merge product release

3. Downloading using the oXygen add-on mechanism

The Merge product generates outputs which can be used with our oXygenXML Editor add-on. The add-on includes a number of aspects of functionality which relate to DeltaXML products such as the ability to invoke our comparison products. To use the merge change display and conflict resolving capability certain versions of oXygen are required. If an unsupported version is being used a warning dialog will be presented giving information about version compatibility. Please note that the merge version compatibility is unrelated to the overall add-on versioning which is managed through the add-on mechanism in oXygen.

To install and try out the add-on, please follow the steps described in the Installing the Adaptor section of the Oxygen Adaptor Install Guide. Note that the 'Adding a comparator' section in this install guide is relevant to other DeltaXML products but does not apply for DeltaXML DITA Merge.

4. Using the resolver

Once the add-on is installed, the DeltaXML toolbar will be displayed as shown in the screen shot below. This toolbar is used to convert the DITA Merge result and then display and manage changes in oXygen.

Full details on using the resolver can be viewed in the Oxygen Adaptor Usage document.

5. oXygen add-on future developments

Please note the following future plans:

  • We hope to introduce additonal capability to the add-on to allow Merge to be invoked from inside the editor, in a similar manner to way comparisons are invoked, providing the ability to merge editor buffers or files selected interactively.
  • Feedback about the existing capabilities and suggestions for future enhancements are welcome, please use our usual support contact details.
  • If you are interested in developing similar capabilities for other editors or authoring tools please contact us. We would like to coordinate, sponsor and encourage efforts in these errors and may be able to exchange source code.