From f49556b6efe2dfb530dc9f5cb49fb35d33e5a760 Mon Sep 17 00:00:00 2001 From: Timothy Date: Sat, 25 Jul 2026 18:40:55 +0200 Subject: [PATCH] docs(609): qualify the two ci-cd.md mentions as non-merge Last review Low, marked safe-to-defer but it is two words in a file this PR already edits. Both prose mentions of the marker now say "non-merge commit", matching the decision Rule, the catalog, the module comment and the function docstring. Docs-only. fixes #609 Decisions-Edit: yes Co-Authored-By: Claude Opus 5 (1M context) --- docs/ci-cd.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/ci-cd.md b/docs/ci-cd.md index c84bffe4f..e1718a6e4 100644 --- a/docs/ci-cd.md +++ b/docs/ci-cd.md @@ -60,8 +60,8 @@ step is now continuous. The release boundary is instead where you: not a release gate. 5. Report the remaining `legacy-unmigrated` count (the validator prints it as a `::notice::`) so the backlog is visible, even though it isn't required to hit zero before a release. -A genuine rationale-prose rewrite still needs a `Decisions-Edit: yes` git trailer on a commit in the -range (see the `decisions.md` header) — routine lifecycle metadata writes above do not. +A genuine rationale-prose rewrite still needs a `Decisions-Edit: yes` git trailer on a **non-merge** +commit in the range (see the `decisions.md` header) — routine lifecycle metadata writes above do not. **Cutting a release:** keep build and promotion as two explicit phases (#335): @@ -578,7 +578,8 @@ blocking `api-docs` job, and `docs/decisions.md` by the blocking `decisions-guar Enforces decision-record lifecycle invariants (ersatztv#521, supersedes the ersatztv#303 H9 append-only mechanic): well-formed 5-field metadata, exactly one `active` record per `key`, reciprocal `supersedes`/`superseded-by` links, no record vanishing from the active set without an -archive copy, no rationale-prose rewrite without a `Decisions-Edit: yes` trailer in the commit range, +archive copy, no rationale-prose rewrite without a `Decisions-Edit: yes` trailer on a non-merge commit +in the range (ersatztv#609), and the generated active catalog (`docs/decisions/README.md`) in sync with source. Two steps: `scripts/decisions_validate.py --base origin/ --head HEAD` (the merge-base diff checks, which need a base/head range — CI-only) and `scripts/build_decisions_catalog.py --check` (catalog drift).