GitHub ccantynz-alt/Gluecron.com main (b4e86b2) carries 13 commits from a July 25 "site-wide bug hunt" session (GitHub PRs #132/#133: nav wiring — /feed, /gists, /migrations, Symbols index, org Health/Insights/SSO/Secrets links, Packages tab, merge queue/servers/wiki links, incident-hooks mount, route-shadowing cleanup) that never reached gluecron. Gluecron main has 247 commits GitHub lacks. Merge-base ae2a071.
A test merge (git merge github/main) conflicts in 15 files — the platform redesign (components.tsx/layout.tsx rewrite) postdates those fixes.
Resolution protocol (judgment, not mechanics):
Branch from gluecron main; merge github/main (add the github remote git@github.com:ccantynz-alt/Gluecron.com.git if absent).
For each conflict, prefer gluecron's HEAD (the redesign is canonical), then verify the GitHub commit's intent survives: does the nav link / tab / mount it added exist on current main? Check by grepping current routes/views, not by keeping the old markup.
Port any intent that is genuinely missing (e.g. the Packages tab in RepoNav, incident-hooks mount) as fresh edits in current idiom.
bunx tsc --noEmit + run nav/layout tests. Open a PR titled so the close-keyword references this issue; after it merges, fast-forward-push gluecron main → GitHub main completes the mirror (until then GitHub keeps the gluecron-main backup branch pushed 2026-08-08).
This is the large-careful class of repair: one per drain run, tests required.
Queued for the internal repair agent.
c comment · e edit title · x close/reopen · ? shortcuts
Reconcile GitHub main into gluecron main
GitHub
ccantynz-alt/Gluecron.commain (b4e86b2) carries 13 commits from a July 25 "site-wide bug hunt" session (GitHub PRs #132/#133: nav wiring — /feed, /gists, /migrations, Symbols index, org Health/Insights/SSO/Secrets links, Packages tab, merge queue/servers/wiki links, incident-hooks mount, route-shadowing cleanup) that never reached gluecron. Gluecron main has 247 commits GitHub lacks. Merge-baseae2a071.A test merge (
git merge github/main) conflicts in 15 files — the platform redesign (components.tsx/layout.tsx rewrite) postdates those fixes.Resolution protocol (judgment, not mechanics):
github/main(add thegithubremotegit@github.com:ccantynz-alt/Gluecron.com.gitif absent).bunx tsc --noEmit+ run nav/layout tests. Open a PR titled so the close-keyword references this issue; after it merges, fast-forward-push gluecron main → GitHub main completes the mirror (until then GitHub keeps thegluecron-mainbackup branch pushed 2026-08-08).This is the large-careful class of repair: one per drain run, tests required.
Queued for the internal repair agent.