memory: the staged design-dev ref moves — read it, do not trust a SHA written here
He rebases onto our main and rewrites the ref in place; it has already gone 878ed86 -> a99b7bb. Merging a SHA copied out of the memory file would merge a pre-rebase branch that predates both his scroll-margin fix and our bug-hunt batch. Third instance of one class today: a 'PUSHED' row that was stale when written, a postbox send-note promoted into durable memory, and now a moving ref recorded by SHA. The file records what was true when written; anything that moves needs a command, not a value.
This commit is contained in:
@@ -47,9 +47,15 @@ _As of 2026-09-22:_
|
||||
(booth `booth-svos-retheme`, ask id `svos`: ship / voice / emblem, all three
|
||||
with design-dev's recommendation attached). **Nothing from us gates it and
|
||||
the branch must NOT be merged until he pings after the rulings.**
|
||||
Branch `refs/heads/design-dev/svos-retheme` @ `878ed86` is fetched into this
|
||||
repo as an **inert ref** — verified: nothing checked out, `main` clean,
|
||||
`git merge-tree` against `33e7149` clean, merged tree 649 green.
|
||||
Branch `refs/heads/design-dev/svos-retheme` is fetched into this repo as an
|
||||
**inert ref** — nothing checked out, `main` clean, merge-tree clean.
|
||||
⚠ **DO NOT TRUST A SHA WRITTEN HERE — READ THE REF.** He rebases onto our
|
||||
`main` and rewrites the ref in place; it has already moved `878ed86` →
|
||||
`a99b7bb` (rebase onto `1826d19`, plus the scroll-margin fix). Merging a SHA
|
||||
copied out of this file would merge a pre-rebase branch. Same class as the
|
||||
stale "PUSHED" row and the stale postbox-mode note: **this file records what
|
||||
was true when written, and a moving ref is not that.** Run
|
||||
`git show-ref | grep svos` and `git merge-tree --write-tree HEAD <ref>`.
|
||||
- 🔶 **THE FIXUP HOLD IS PARTIAL, NOT BLANKET.** `booth/templates/booth.html`
|
||||
is **RELEASED** — design-dev does not touch it, so bug-hunt findings there
|
||||
land immediately. **HELD** while his branch is out: `base.html`, `view.html`,
|
||||
|
||||
Reference in New Issue
Block a user