Sync Conflict Resolution

When You See This Screen

The Sync Conflict Resolution screen appears when DavianVault detects that both your local vault and cloud backup have been modified since the last sync. This can happen when you use DavianVault on multiple devices and both devices made changes before syncing.

---

What You See

• A large red warning icon
• The heading "Vault Conflict Detected"
• An explanation: "Your vault has been modified on multiple devices. You need to choose which version to keep."

Cloud Version Card

Shows information about the cloud backup:

• "Modified on another device since last sync"
• The device nickname and abbreviated device ID of the device that uploaded it
• The snapshot version identifier

Local Version Card

Shows information about your local vault:

• "Modified on this device since last sync"
• Your device's nickname

Warning Banner

"The version you don't choose will be backed up but not synced."

Action Buttons

1. "Preview Differences" — compare both versions side by side
2. "Accept Cloud Version" — replace your local vault with the cloud version
3. "Keep Local Version" — keep your local vault and upload it to the cloud

---

Your Options

Option 1: Preview Differences First

If you're not sure which version to keep:

1. Tap "Preview Differences"
2. An explanation dialog appears: "This will temporarily decrypt both versions in memory for comparison only"
3. Enter your master password when prompted
4. Both versions are downloaded and compared
5. A diff viewer shows what's different between the two versions
6. After reviewing, your vault is re-locked and the temporary data is cleared from memory

Option 2: Accept Cloud Version

Use this when the cloud version has the latest changes you want to keep:

1. Tap "Accept Cloud Version"
2. A confirmation dialog appears: "This will download the cloud vault and replace your local data. Your local changes will be backed up."
3. Confirm to proceed
4. The cloud version is downloaded and becomes your active vault
5. Your local version is automatically saved as a backup (not lost)

Option 3: Keep Local Version

Use this when your local changes are the ones you want to keep:

1. Tap "Keep Local Version"
2. A confirmation dialog appears: "This will keep your local vault and upload it to cloud. Cloud changes will be overwritten."
3. Confirm to proceed
4. Your local vault is uploaded to Google Drive, replacing the cloud version

---

Conflict History

After resolving a conflict, it's recorded in your Conflict History (accessible from Cloud Sync Settings):

• Each conflict record shows: when it was detected, when it was resolved, what resolution was chosen
• You can view statistics (total conflicts, resolution breakdown, average resolution time)
• You can export conflict history as JSON
• You can clear conflict history

---

Avoiding Conflicts

To minimize sync conflicts:

• Sync frequently — enable background sync with a short interval
• Sync before switching devices — tap "Sync Now" before closing the app
• Use the same sync strategy — set the same conflict resolution strategy on all devices
• Wait for sync to complete — don't close the app immediately after making changes

---

Important Notes

• The version you don't choose is always backed up — it's not lost permanently
• If something goes wrong during conflict resolution, the app rolls back to your previous state
• All conflict resolution actions are recorded in the audit log
• If your session has expired, you may need to re-authenticate with Google before resolving