w33ble/mediacast
Watch
1
0
Fork
You've already forked mediacast
 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

docs: stacked-PR recovery playbook in agent notes #9

Merged
w33ble merged 3 commits from docs/stacked-pr-playbook into main 2026-09-06 22:39:21 -06:00
Conversation 1 Commits 3 Files changed 1 +27 -1
hijynx commented 2026-09-06 22:31:43 -06:00
Collaborator
Copy link

Adds the recurring squash-merge / stacked-PR gotchas to AGENTS.md, plus the retro notes branch contents (merged in via c6e8b3a):

  • Stacked PRs after a squash merge: mechanical recovery — rebase --onto origin/main, gates, force-with-lease, open/retarget via Forgejo API. Includes the forgejo pr create --body newline-mangling trap.
  • Squash-merge cleanup (from docs/retro-agents-notes): git branch -d refusal after squash is expected; delete with -D.
  • Test-seam notes (from docs/retro-agents-notes): :memory: single-conn deadlock rule; driver timestamp shape (RFC 3339 time.Time scan, feed.PubDate layouts).
  • Refreshes the Fake runner flag list (adds NoDesc).

Supersedes the retro-notes branch (docs/retro-agents-notes).

Adds the recurring squash-merge / stacked-PR gotchas to `AGENTS.md`, plus the retro notes branch contents (merged in via c6e8b3a): - **Stacked PRs after a squash merge**: mechanical recovery — rebase `--onto origin/main`, gates, force-with-lease, open/retarget via Forgejo API. Includes the `forgejo pr create --body` newline-mangling trap. - **Squash-merge cleanup** (from docs/retro-agents-notes): `git branch -d` refusal after squash is expected; delete with `-D`. - **Test-seam notes** (from docs/retro-agents-notes): `:memory:` single-conn deadlock rule; driver timestamp shape (RFC 3339 `time.Time` scan, `feed.PubDate` layouts). - Refreshes the Fake runner flag list (adds `NoDesc`). Supersedes the retro-notes branch (docs/retro-agents-notes).
docs: stacked-PR recovery playbook in agent notes
Some checks failed
ci / check (pull_request) Has been cancelled
Details
01ef3523b7
docs: record driver timestamp shape, :memory: deadlock, squash-merge cleanup in AGENTS
All checks were successful
ci / check (pull_request) Successful in 4m4s
Details
76ad78065a
docs: merge retro agent notes (squash-merge cleanup, :memory: deadlock, timestamp shape)
All checks were successful
ci / check (pull_request) Successful in 4m6s
Details
c6e8b3a110
w33ble approved these changes 2026-09-06 22:34:54 -06:00
w33ble merged commit 891c9c878d into main 2026-09-06 22:39:21 -06:00
w33ble deleted branch docs/stacked-pr-playbook 2026-09-06 22:39:21 -06:00
Sign in to join this conversation.
Reviewers
No reviewers
w33ble
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
w33ble/mediacast!9
No description provided.