File syncSafety

Sync conflicts

Resolve Team OS file sync conflicts.

Terminal push sends the SHA saved by the last pull. Command Centre refreshes the current server SHA and opens a review before it applies changes.

Either flow returns a conflict if the server file changes after its SHA check, instead of silently overwriting the new remote version.

Command Centre shows conflicts in its review before it overwrites local or server files.

To resolve a conflict:

  1. Run sync pull into a clean folder.
  2. Compare the remote file with your local change.
  3. Merge the content manually.
  4. Run sync push again.

Next: Sync exclusions