Conflicts

Resolve a conflict

Review competing changes without repeatedly rerunning the task.

Open the affected items

Click a Sync Space’s Needs attention or conflicts indicator, or open Activity → Conflicts. Review the affected Sync Space and path.

Compare the copies

Check which file contains the changes you need. A modified-versus-deleted conflict requires an explicit decision about keeping the modified copy or applying the deletion. Do not choose solely from a timestamp when both sides may contain useful edits.

Choose a resolution

Use the resolution choices offered for the conflict. When available, keep both copies if you need to compare their contents separately. Review the result, then run the task again if further synchronization is needed.

Check the task status

After resolving all current conflicts, return to Sync Spaces. If attention remains, open Activity to check for other errors, missing folders or a new conflict. Starting repeated runs does not resolve a real conflicting edit.

Need a hand?

Tell us where you got stuck. We’re here to help.

Contact support