During file synchronization a file conflict occurs when a file has changed in both locations (source and target) since the last sync, making it difficult to determine which version should be left unchanged and which version should be updated.
For example, if you've changed a document on your desktop computer since the last synchronization and also made a different change to the same document on your laptop, a file conflict will occur.
ViceVersa PRO (ViceVersa Plus does not track file conflicts) will mark file conflicts in the comparison window with a ** in front of the name and will also report conflicts in the log file and the scheduler, so that you can decide which version you want to keep and which version you want to update.
There is a profile option in ViceVersa PRO to 'Synchronize files even if in conflict (synchronization
method)'. When this option is enabled,
ViceVersa PRO will synchronize also file conflicts: it
will copy the newer file over the older file and rename the older file into
filename_[timestamp]_CONFLICT and keep it in the same folder.