Same-file multi-device edit: 4 options
Two devices edited the same passage — desktop wrote A, mobile wrote B, who wins? ConflictResolver lets you choose.
When this happens
- Wrote a passage on desktop
- Mobile (forgot to sync) edited the same passage
- Desktop reconnects to push → cloud says "hold on, mobile's edits haven't synced"
- Desktop fetches mobile's edit → conflict!
ConflictResolver appears.
Four options
[ Keep mine ] [ Use theirs ] [ Keep both ] [ Manually merge ]
1 · Keep mine
Current device's version wins. The other version syncs in but is overwritten.
Slima auto-versions the other side (Auto-version rules) so you can restore later.
2 · Use theirs
The other device's version wins; current is overwritten. Same auto-version backup.
3 · Keep both
Both versions stay as two adjacent passages. You decide later which to keep / delete.
4 · Manually merge
Opens diff view; you see A vs B side-by-side and write the final version yourself.
Safety guarantee
Before you choose, Slima snapshots both originals:
Version A(your device)Version B(the other)
No matter what you pick — picking wrong is also recoverable (restore version).
Avoidance habit
Before switching devices, confirm sync is complete (🟢 green) — see Sync status.
Related
Was this helpful?