If a synchronized file is
modified on more than one computer without updating the file with
the Desktop Agent, a conflict occurs and you are prompted to
determine which file version to keep. For example, a conflict
occurs if the same file is modified on both your desktop computer
and your laptop and your laptop is disconnected from the network.
When your laptop is subsequently connected to the network, the
conflict is detected.
To resolve a conflict with a synchronized file
In the Tasks bar, under
Views, click Status.
If a conflict is
identified, a resolve conflicts option appears in the Status
Click the Conflicts have been found link to open the
Resolve Conflicts wizard.
Review the information on
synchronization conflicts, and then click Next.
Select the file that
contains the conflict.
Click Open Folder.
Manage the revisions as
For example, to keep an
older revision, you can delete the newer revision and rename the
conflicting revision back to its original name.