Sync Conflict Resolution

Document created by Fern Udomrasami on Dec 20, 2016Last modified by Jose Gonzalez on Mar 21, 2017
Version 6Show Document
  • View in full screen mode

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

 

Skip files to manually resolve conflicts

 

Conflict Rule: Skip files to manually resolve conflict (default on)

File state on

Action set for schedule

Server Repository

User's Repository

Upload and Download

Upload Only

Download Only

New

New (same name, same location, different versions)

Do nothing

Do nothing

Do nothing

Modified

Modified (same name, same location, different content)

Do nothing

Do nothing

Do nothing

 

Files on my computer override Trimble Connect to automatically resolve conflicts

 

Conflict Rule: Files on my computer override Trimble Connect to automatically resolve conflicts

File state on

Action set for schedule

Server Repository

User's Repository

Upload and Download

Upload Only

Download Only

New

New (same name, same location, different content)

Upload

Upload

Do nothing

Modified

Modified(same name, same location, different content)

Upload

Upload

Do nothing

 

Files on Trimble Connect override my computer to automatically resolve conflicts

 

Conflict Rule:  Files on Trimble Connect override my computer to automatically resolve conflicts

File state on

Action set for schedule

Server Repository

User's Repository

Upload and Download

Upload Only

Download Only

New

New (same name, same location, different content)

Download

Do nothing

Download

Modified

Modified(same name, same location, different content)

Download

Do nothing

Download

Attachments

    Outcomes