Sync Conflict Resolution
What is a Sync Conflict?
A conflict occurs when a specific condition exists during the synchronization of files in a project. The condition that causes a conflict is when a new version of an existing file exists locally and a new version of the same file also exists on Trimble Connect. At this point, the sync tool does not know which file (locally vs Trimble Connect) is the most current file and needs user input to determine which file to upload or download. The method of which this is resolved is to manually resolve the conflict or set a rule to either always override the file that is on Trimble Connect (upload) or to always override the file that exists locally (download).
There are three rules of synchronization conflict resolution:
Skip files to manually resolve conflict
Files on my computer override Trimble Connect to automatically resolve conflicts
Files on Trimble Connect override my computer to automatically resolve conflicts
The result or outcome of the three sync rules is also based on the sync direction settings:
Manually Resolve Conflicts
Conflict Rule: Skip files to manually resolve conflict (default on).
If the below scenarios occur, the application will skip the files and you will need to choose how to handle the conflict.
Override Files on the Server
Conflict Rule: Files on my computer override Trimble Connect to automatically resolve conflicts.
Override Files on Your Computer
Conflict Rule: Files on my computer override Trimble Connect to automatically resolve conflicts.
Next Topic: Sync Statuses