Resolve upload and download conflicts

Conflicts can occur when two users edit and submit two versions of the same file. It is important to manually resolve a conflict so that all Helix Sync users have the correct version of the file. To resolve the conflict, contact the user that made the change, discuss the changes each of you made to the file, and agree on whose changes you want to use.

Resolve download conflicts

If there is a file on the Changes by others list that is also in your My changes list, Helix Sync will mark the file with Conflict and highlight the affected file in red in the My changes list.

1. When Helix Sync finds a conflict, a dialog box opens that tells you who changed the file and when.

2. Click Revert my changes to download the file from Helix Core Server. This will overwrite your version of the file.

   Tip

   Your version of the file is automatically moved to your trash can/recycle bin so you can restore it if needed.

Resolve upload conflicts

If there is a file on the My changes list that is also in your Changes by others list, Helix Sync will mark the file with Conflict and highlight the affected file in a red in the Changes by others list.

1. When Helix Sync finds a conflict, a dialog box opens that tells you who changed the file and when.

2. Click Upload your changes and overwrite others' changes to upload the file to Helix Core Server and overwrite the other file version in Helix Core Server.