Sync Conflict Resolution

How to resolve synchronization conflicts when managing files in a project.

What is a Sync Conflict?

A conflict occurs when there is a new version of a local existing file and a new version of the same file exists on Trimble Connect. At this point, the sync tool does not know which file (locally vs Trimble Connect) is the most current file.

The application requires user input to determine which file to upload or download. You can 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
Files on Trimble Connect override my computer to automatically

The outcome of the three sync rules is also based on the sync direction settings:


Icon	Description
	Bi-directional Sync (Upload & Download) - transfers new and updated data from the server and local repositories.
	Upload Only - syncs only new or changed data from your local repository to the server.
	Download Only - syncs only new or changed data from the server to your local repository.

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.


File Status on…		Sync Direction…
Server	Local	Upload & Download	Upload only	Download only
New	New	Do nothing	Do nothing	Do nothing
Modified	Modified	Do nothing	Do nothing	Do nothing

New: Same name, same location, different file version.
Modified: Same name, same location, same version, different content.
Do nothing: 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.


File Status on…		Sync Direction…
Server	Local	Upload & Download	Upload only	Download only
New	New	Upload local	Upload local	Do nothing
Modified	Modified	Upload local	Upload local	Do nothing

New: Same name, same location, different file version.
Modified: Same name, same location, same version, different content.
Upload: Local version will override the version on the server.
Do nothing: You will need to choose how to handle the conflict.

Override Files on Your Computer