3.2.0-beta.10). Features may change before the next stable release.Switch to stable →sync
ak secrets sync settle
Resolve a sync conflict by choosing which value to keep
Use ak secrets sync settle for the operation described below. The command help records its arguments, effects, and options.
Command contract
Resolve a sync conflict by choosing which value to keep
Synopsis
Choose the value a conflicted secret keeps on every device: this device's (local), the current synced value (remote), or one conflict branch (branch:<id>, IDs from ak secrets sync status). Runs one sync cycle around the choice. Refused when an AI agent runs it.
Effects: Pushes signed records that close the conflict, and updates this device's store to the kept value.
Exit status: 0 conflict resolved 2 invalid --keep, or the store moved since enable 3 the ref, or the branch, has no open conflict 6 refused: an AI agent is running this command 10 sync is not enabled on this device 11 the vault server is unavailable or busy; retry 12 resolved, but something else needs attention 13 integrity alarm; sync halted 14 not logged in, or this device was removed
ak secrets sync settle <ref> [flags]Examples
ak secrets sync settle OPENAI_API_KEY --keep local
ak secrets sync settle OPENAI_API_KEY --keep branch:0123456789abcdef0123456789abcdefOptions
--backend string Storage backend: keychain (default), file (age-encrypted vault), or memory (dev/test; values and its index are throwaway)
-h, --help help for settle
--json Emit machine-readable JSON (implies --no-interactive)
--keep string Which value to keep: local, remote, or branch:<conflict_id>
--no-interactive Disable interactive prompts (CI-safe)
-q, --quiet Suppress non-error output on stderr
--unlock-with-recovery Open the file backend's vault with a recovery private key and set a new passphrase
-V, --verbose Extra diagnostic output on stderr (loses to --quiet)
--wait-lock duration How long to wait for another sync cycle to finish (default 30s)
-y, --yes Assume yes for all promptsSEE ALSO
- ak secrets sync - Sync secrets across your machines with end-to-end encryption (preview)