📋 Free Download: 2026 HIPAA Compliance Checklist — updated for the latest OCR enforcement priorities. Get it free →

End User Guide 5 min read

File Conflict Resolution

AXIS CloudSync is designed to never lose or erase data. When two users edit the same file simultaneously, the system creates a conflict copy to preserve both versions. This guide explains how conflicts happen, how to identify them, and how to resolve them.

What is a File Conflict?

A file conflict occurs when two or more users (or devices) make changes to the same file before those changes have been synced. AXIS CloudSync resolves this by preserving all versions -- it never silently overwrites or deletes a version of your data.

When a conflict is detected, AXIS CloudSync keeps the most recently synced version as the primary file and creates a conflict copy of the other version. The conflict copy is renamed to include the username and timestamp of the conflicting edit, making it easy to identify.

Note

AXIS CloudSync is designed to never lose data. Even in a conflict, both versions of the file are preserved. No data is deleted or overwritten without your explicit action.

How Conflicts Happen

Conflicts most commonly occur in these situations:

  • Two users edit the same file simultaneously -- both users open the file, make changes, and save before the other's changes have synced.
  • Editing while offline -- you edit a file while disconnected, and another user edits the same file before you reconnect and sync.
  • Multiple devices -- you edit a file on your laptop, then edit it again on your desktop before the laptop's changes have synced.
  • Slow sync -- on a slow connection, changes may not sync quickly enough to prevent a second edit from creating a conflict.

Identifying Conflicts

Conflict copies are easy to identify because they are renamed with a specific pattern:

  • The conflict copy filename includes the username of the user whose version was preserved as the conflict copy.
  • The filename also includes a timestamp indicating when the conflict was detected.
  • Example: Q4_Report.xlsx becomes Q4_Report (conflicted copy - john.doe - 2026-04-12).xlsx.
  • Conflict copies appear in the same folder as the original file.
  • In the web portal, conflict copies are displayed with a conflict indicator icon.

Tip

If you see an unexpected duplicate file with a username and date in the filename, it is a conflict copy. Do not delete it until you have reviewed both versions and merged any needed changes.

Resolving Conflicts

To resolve a conflict, you need to review both the primary file and the conflict copy, merge any differences, and delete the conflict copy.

  1. 1Open both the primary file and the conflict copy side by side.
  2. 2Compare the two versions and identify the differences. Use a diff tool or manually review the changes.
  3. 3Copy any needed changes from the conflict copy into the primary file.
  4. 4Save the primary file with all the merged changes.
  5. 5Delete the conflict copy once you are confident all needed changes have been preserved.

Important

Do not delete the conflict copy until you are certain you have reviewed it and merged all necessary changes. Once deleted, the conflict copy cannot be recovered unless you have version history enabled.

If you need to recover an older version of either file, use the Version Restore feature in the web portal. See the Version Restore guide for instructions.

Preventing Conflicts

The best way to handle conflicts is to prevent them from happening in the first place. AXIS CloudSync provides a built-in tool for this: File Locking.

  • Lock files before editing: Right-click any file and select Lock File to signal to other users that you are editing it.
  • Locked files show a lock icon to all team members, preventing others from editing until you unlock.
  • Communicate with your team: Let colleagues know when you are working on a shared file.
  • Keep the desktop client running: Ensure sync is active so changes propagate quickly before others can create conflicts.
  • Avoid editing while offline: If possible, wait until you have a stable connection before editing shared files.

Tip

See the File Locking guide for step-by-step instructions on locking files from the web portal, desktop client, and mobile app.
Back to All Tutorials
Schedule a Demo