Skip to content

atomic-landing

Provenance

  • Source: .spec/spexcode/.plugins/prompts/atomic-landing/spec.md
  • Source SHA-256: d20292a661585a9d46f74a700860221dd9a5ebad3bc3ac1436cde8eb2bb30a7f

Landing is atomic

  1. In your worktree, merge <base> into the branch, resolve conflicts there, and rerun the proof.
  2. Immediately before landing, require git merge-base --is-ancestor <base> <branch>; otherwise sync again.
  3. A clean textual merge is not product proof; the synced branch's verification is required.

spex guide spec has the shared-checkout mid-merge rule.