#950 Add facility for conflict resolution during team sync

[Aaron Madlon-Kay]

Currently when OmegaT syncs a team project it will silently discard conflicting segments. It would be better for OmegaT to offer an interface for the user to manually resolve conflicts.

To improve OmegaT's behavior in this area I have developed a tool for 3-way merging translation data, SuperTMXMerge (STM).

STM will be embedded in OmegaT and used to merge the project TMX upon team sync.

• If there are no conflicts, the merge results will be applied immediately and the user will not be prompted.
• If there are conflicts, the user will be required to resolve the conflicts via a window that allows the user to compare the translations for each conflicting segment.

[Aaron Madlon-Kay]

Implemented in r5945.

[Aaron Madlon-Kay]

Steps for testing conflict resolution:

1. Make a sample team project served by svn or git.

2. Launch two instances of OmegaT.

3. In both instances do "Download Team Project" and point to the same
   remote project, but in each instance save to a different local folder.

4. Once the team project is loaded in both instances, change the same
   segment in both instances and save. One of the instances will report a
   conflict and prompt you to resolve it.

5. After resolving, the choice made will be reflected in the other
   instance when it re-syncs (upon save or autosave).

[Didier Briel]

The strings needed for OmegaT will be part of OmegaT, and localized using the usual OmegaT localization process.

Didier

[Aaron Madlon-Kay]

You can determine the version of SuperTMXMerge included in OmegaT by inspecting the Implementation-Version property of the JAR's MANIFEST.MF.

[Didier Briel]

Implemented in the released version 3.1.0 of OmegaT.

Didier