From 70b334d9519fd05d717b53cd2a722cfc8603aac7 Mon Sep 17 00:00:00 2001 From: Levi Neuwirth Date: Thu, 20 Aug 2026 17:56:06 +0200 Subject: [PATCH] docs(lane): rebase onto 5f2015c, and note the gate that follows is head-exact The branch was two behind, not one --- 24e4039 and 5f2015c both landed on main after the first rebase. Rebased onto 5f2015c cleanly, no conflicts; both commits picked up are docs-only. The previously recorded 16-stage green ran about a minute BEFORE 3d08255 was committed, which makes it worktree evidence rather than head-exact evidence. This commit is the last content change before the gate is re-run, so the run that follows measures the head that is proposed for merge. Co-Authored-By: Claude Opus 5 (1M context) Claude-Session: https://claude.ai/code/session_016bqGA6s9tTUFzYpbeW3tai --- docs/active-work.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/docs/active-work.md b/docs/active-work.md index ea03521..11b44ba 100644 --- a/docs/active-work.md +++ b/docs/active-work.md @@ -272,13 +272,16 @@ waits for a signal that is not coming. ## Panel cell-mapping generation (v25) — REBASED, FULL GATE GREEN, review round 4 fixed -- **REBASED onto `f13506c`** (post-#241 main); the rebase itself landed - at `3e68b76`, and everything after it is review-round work. One - conflict, in this file: main's merged-#241 block and this lane's own +- **BASE IS `5f2015c`**, current `githubsucks/main`. Rebased there + cleanly, no conflicts; the two commits picked up are docs-only (the + `rd_precondition` occurrence record and the handoff's `timeout` + rule). +- The **first** rebase, onto `f13506c` (post-#241 main), took one + conflict in this file: main's merged-#241 block and this lane's own first-commit block landed at the same position; both kept, active - lane above merged. No code file overlapped — #241 touched `scripts/`, - `tests/common/` and two test suites; this lane touches the protocol, - daemon and GPU sources. + lane above merged. No code file has overlapped across either rebase — + #241 touched `scripts/`, `tests/common/` and two test suites; this + lane touches the protocol, daemon and GPU sources. - **NO AHEAD-COUNT OR TIP SHA IS RECORDED HERE, deliberately.** Both were wrong within one commit the last two times they were written, because the commit that updates this file is itself the commit that