Module sync 

Three-way vault merge for concurrent edit reconciliation.

merge takes a common ancestor and two diverged VaultFile snapshots and produces a merged result. Secret additions and deletions from both sides are applied; conflicting edits (same key changed differently) resolve in favour of the theirs side with a conflict marker in the merged entry’s tags.

Structs

MergeDecision

Explicit per-key outcome from the sync merge lifecycle.

MergeResult

Result of a three-way merge between base, ours (local), and theirs (remote) vault files.

Enums

MergeState

Merge lifecycle states for one key across base, ours, and theirs.

Functions

three_way_merge

Three-way merge of vault files at the per-key level.