Resolve conflicts and recover work

When another writer changes a file while you edit it, FlashDrive preserves competing work rather than silently overwriting it. Start by checking your mounted drive:

flashdrive mounts

Reconcile a conflict copy

1. Open the current drive file and its conflict copy.
2. Compare the changes and save the version you want to keep.
3. Wait for synchronization, then check flashdrive mounts again.
4. Remove a redundant conflict copy only after checking that the intended result is saved.

Independent text edits can merge when they affect different parts of a common version. Overlapping edits and binary changes can need a decision. Do not treat the mere presence of both files as a resolved conflict.

Recover unsaved work

A disconnected or interrupted mount can keep local changes that are not yet on the drive. Keep the recovery files named by the CLI. Reopen the original mount with the recovery command it prints, using the same profile and API address.

Run flashdrive mounts after reconnecting. If it still reports unsaved changes, read the per-file message and resolve the cause before deleting local data or reporting that the cloud copy is current.

Review held deletions

A large removal can be held for confirmation. Use flashdrive mounts to review the exact paths. If you intend those removals, run the exact confirmation command printed for that set. A changed deletion set needs a new confirmation.

Recover a refused direct edit

For an edit or replacement refused because the revision changed, read the latest file, compare it with your intended change, and submit a new edit against that revision. For an accepted upload whose wait timed out, check its status rather than submitting it again.