journal: record stale-branch base pollution from PR #69/#70#71
Merged
Conversation
PRs #69 and #70 were created from a stale local branch whose contents had already squash-merged to main as #68. Different SHAs hid the equivalence from `git fetch -p`, and both PRs carried 2 orphan commits until rebased. Adds: - journal entry documenting what happened, root cause, and fix - AGENTS.md pre-work step 9: explicit `git branch --show-current` assertion before `git checkout -b` - ROADMAP entries for #67, #69, #70 plus AEO content guide as next item
Contributor
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Closeout for the AEO baseline workstream (#69, #70). Captures the process failure that surfaced mid-session and updates the pre-work checklist to prevent recurrence.
Why this exists
While shipping #69 and #70, both PRs initially carried two orphan commits from a stale local branch whose contents had already squash-merged to
mainas #68. Different SHAs hid the equivalence fromgit fetch -p. The reviewer caught it; both PRs were rebased ontoorigin/mainand force-pushed.The journal entry is the third PR-hygiene failure recorded. The pattern across all three: rules exist, but the procedural trigger points where rules must fire are under-specified.
Changes
journal/2026-05-08-stale-branch-base-pollution.md— what happened, root cause, fix, evolution notes (EN+ZH).AGENTS.mdGit Workflow — new pre-work step 9: explicitly verifygit branch --show-currentreturnsmainright beforegit checkout -b. Squash-merge makes stale-branch detection unreliable via SHA; this is a terminal-state assertion rather than a sequence of actions.ROADMAP.md— check off infra: extend Quality Baseline with CSS variable, divider, and FOUC rules #67, infra: strengthen AEO baseline for AI answer engines #69, build: generate llms-full.txt for AI ingestion #70; add "AI visibility / AEO content guide" as the next content item (the planned Layer 1 guide that closes this workstream).Manual follow-ups (tracked separately, not in this PR)
External submissions that require login and cannot be automated from the repo:
These will be handled out-of-band. The handbook's technical readiness for them shipped in #69 and #70.