Skip to main content

Module merge

Module merge 

Source
Expand description

Three-way merge driver for .murk vault files.

Operates at the Vault struct level: recipients as a set, schema and secrets as key-level maps. Ciphertext equality against the base determines whether a side modified a value (murk preserves ciphertext for unchanged values).

Structs§

MergeConflict
A single conflict discovered during merge.
MergeResult
Result of a three-way vault merge.

Functions§

merge_vaults
Three-way merge of vault files at the struct level.
regenerate_meta
Attempt to regenerate the meta blob for a merged vault.