Review changes and conflicts

On this editor tab, you can review conflicts and changes from your project or from part of it.

When you work on a document in an online project, others can also work on the same document at the same time. Someone else can change the same document that you have in a local copy on your computer.

Online project means a checkout of an online project: When you work on the changes and conflicts, you are editing a document in the checkout (the local copy) of the online project.

When you are editing a document in an online project, memoQ automatically saves your changes to the document. If a segment you save also changed on the server, memoQ downloads the server's version, and indicates a conflict if there is any.

In addition, you can manually download the changes made by others. On the Documents ribbon, click Synchronize. From the menu, choose Synchronize Project.

memoQ downloads the newest version of the document or synchronizes the project. During the download, memoQ will find segments that were changed by others, too. memoQ updates your copy of the document with these changes. memoQ will mark the changed segments with a change mark. There are two types of change marks:

• : This marks a change in the segment that was made by someone else. Whatever text you had in this segment is gone, and it is replaced by the text written by the other user.
• : This marks a change in the segment that was made by you, and was saved to the server. This indicates that the segment was changed by someone else, but that change was overwritten by your version of the text.

How to get here

1. Open a project that was checked out from an online project.
2. On the Preparation ribbon, click Changes and Conflicts. From the menu, choose Review Changes and Conflicts. The Review conflict and change marks window opens.
3. Choose which parts of the project you want to review, and click OK.

   The Review changes and conflicts tab opens.

What can you do?

On the list at the bottom of the window, you can go through the list of conflicts and changes. Click the item you need to deal with.

Or, press Ctrl+Down or Ctrl+Up to move around in the list.

When you select a conflict or change, the corresponding segment appears in the middle of the window. You can confirm the current text, or dismiss the change.

When you deal with conflicts - when your translation was overwritten from the server:

• To use the version from the server: Confirm the segment. Press Ctrl+Enter. Or, to confirm the segment without updating the working translation memory, press Ctrl+Shift+r.
• To use your version, and dismiss the version from the server: Press Ctrl+Space. It will move to the next conflict or change. In the list, you can also click the Dismiss check box in the row of the conflict.
• To dismiss every change, and go back to the original contents of the segments: At the top of the tab, click Dismiss all changes.

  When you deal with changes - when your translation overwrote someone else's translation on the server:

• To use your version, and overwrite the version on the server: Confirm the segment. Press Ctrl+Enter. Or, to confirm the segment without updating the working translation memory, press Ctrl+Shift+r.
• To use the version on the server: Press Ctrl+Space. It will move to the next conflict or change. In the list, you can also click the Dismiss check box in the row of the conflict.
• To dismiss every change, and go back to the original contents of the segments: At the top of the tab, click Dismiss all changes.

When you finish

You do not have to save the documents: memoQ will automatically save every change, even in segments that were not confirmed.

To return to Project home: Close the Review changes and conflicts tab by clicking the Close button on the tab itself. Or, press Ctrl+F4.