Broswer Based Merge Resolver

We have an experimental output format that can be used to resolve conflicts using an interactive HTML interface. This format is ideal for subsequent processing, the first system represents the changes and conflicts using a browser-based conflict resolver. You should see an HTML rendering of the DITA and radio buttons which can be used to select/approve the changes and select the appropriate content where there is conflict. Clicking the 'apply changes' button sends the selections to the server which then processes the data and creates a pure DITA file which could, for example, be a new version in a content/document management system.