Conflict management

A conflict means Crate needs your help choosing between changes. The review flow lets you compare the versions before deciding what belongs in the vault.

Review a text conflict

1. Open Sync activity → Conflicts.
2. Select Review beside the file you want to inspect.
3. Compare your current file with the saved copy. Red marks removed text; green marks added text.
4. Choose the current version, the saved version, both versions, or a custom combined result.
5. Check the selected result, then confirm the resolution.

For a custom result, include the parts you want from each version and read through the combined text before confirming. After resolving, open the note and sync again.

If you are unsure, preserve both copies while you compare them. Do not delete conflict copies just to clear the list.

Attachments and binary files

Updates to existing binary files also require review. Crate can preserve and show the competing files, but it cannot merge their contents as text. Inspect each version in the appropriate app before applying a choice.

Reduce repeated conflicts

Let a device sync before continuing the same note on another device. When returning from a long offline session, inspect pending changes and let the devices catch up before making more edits.

If you need time to review a difficult situation, turn off automatic sync on the affected device and keep a backup of its vault. Review the available file history and checkpoints before discarding content.