126
Dealing with conflicts
W
hen you are keeping folders on two computers in sync, a conflict occurs when a file has been
modified on both computers since the last time you synchronized. You can handle these conflicts when
you preview or run the agent, or you can set options to handle them automatically.
Conflicts between files
Conflicts occur when you modify a file on both of your com-
puters. Since both files are new, you need to decide how to
handle them. These are the choices you can make while
previewing or running an Xchange Agent:
• Copy either the older or the newer file to the other
folder, replacing the file already in that folder.
• Copy either the older or the newer file to the other folder
and give the file a new name. Nothing is replaced.
• Skip the conflict, without copying either file.
When you skip a conflict, you carry it over to future synchro-
nizations. There are now two categories of conflicts:
•
New conflicts
Files have been changed on both
computers since the previous synchronization.
•
Old conflicts
Conflicts were left unresolved in earlier
synchronizations. The two computers now have differ-
ent versions of the same file, and both are dated prior to
the latest synchronization. You can treat these conflicts
like new conflicts, or ignore them and let both versions
remain.
