126Dealing with conflictsWhen you are keeping folders on two computers in sync, a conflict occurs when a file has beenmodified on both computers since the last time you synchronized. You can handle these conflicts whenyou preview or run the agent, or you can set options to handle them automatically.Conflicts between filesConflicts occur when you modify a file on both of your com-puters. Since both files are new, you need to decide how tohandle them. These are the choices you can make whilepreviewing or running an Xchange Agent:• Copy either the older or the newer file to the otherfolder, replacing the file already in that folder.• Copy either the older or the newer file to the other folderand 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 bothcomputers since the previous synchronization.• Old conflicts Conflicts were left unresolved in earliersynchronizations. The two computers now have differ-ent versions of the same file, and both are dated prior tothe latest synchronization. You can treat these conflictslike new conflicts, or ignore them and let both versionsremain.
