Resolving conflicts

When you're working in a team project as part of a team, "conflicts" might occur occasionally when two members of the team provide or edit translations for the same source text. OmegaT might display a Merge dialog which allows you to select the correct version.

For example:

The Merge dialog above shows 1 conflict that you must resolve: two other members of the team (i.e. Grace and prcar) have produced conflicting translations for the source text "Your YSCQ Personal Dashboard...".

For each conflict, you may select the correct version by clicking on the text box containing it:

The dialog above (in Detail View) shows metadata that you might not need. If that's the case, you may prefer switching to the List View. You may toggle between the Detail View and the List View using the same button.

When there are several conflicts, the list view will display them as a table.

When you're done with the resolution of all conflicts, press Done.