ums: re-audit after programmatic comment edits; sibling-merge clobber hazard - #126
Conversation
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Pull request overview
This PR updates memories/debugging.md to capture two recurring review/debugging lessons from the sparta scrub PRs: (1) scripted comment edits can leave behind punctuation/grammar artifacts, and (2) merging main into a sibling PR can silently overwrite (“clobber”) files that weren’t actually customized in the sibling.
Changes:
- Adds a checklist of common punctuation/grammar failure modes after programmatic comment scrubs, with suggested audits/greps.
- Adds guidance on verifying merge results when syncing a sibling PR after another PR lands, to catch silent “clean merges” that change PR-specific files.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
…larify example - Fully-qualify Lacaedemon/sparta#143/#150/#152 (ambiguous as bare refs in ai-config). - Audit grep used \d (PCRE) — switch to [0-9] for grep -E; note sed -E for the strip patterns. - Clarify the orphaned-comma example as the two-line continuation case. - 'a file that B never customized' (grammar).
This comment has been minimized.
This comment has been minimized.
The strip patterns need -E only for the + quantifier; \( \) match literal parens in ERE. Drop the inaccurate 'and groups' claim.
This comment has been minimized.
This comment has been minimized.
s/^# #[0-9]+: /# / expresses 'strip prefix only' precisely; the ^ anchor makes the g flag unnecessary.
This comment has been minimized.
This comment has been minimized.
From Lacaedemon/sparta#150 — a second driver rebased/force-pushed the branch three times. Capture the fetch-before-push check, reset-and-verify response, stand-down-when-origin-is-correct rule, and escalate-on-repeat guidance.
This comment has been minimized.
This comment has been minimized.
…ent' The check is whether your HEAD is still origin's HEAD (in sync), not a comparison to your commit's parent.
This comment has been minimized.
This comment has been minimized.
rev-parse HEAD vs origin always differs when you have unpushed local commits; git log HEAD..origin/<branch> (non-empty = origin moved past you) handles that case cleanly.
|
Claude finished @d-morrison's task in 2m 51s —— View job Review complete
No new findings. All prior inline findings have been addressed, and the latest commit ( Technical verification:
Cross-repo refs: All three sparta references use fully-qualified form ( AI tells: None. Prose is specific, concrete, and direct throughout. ✓ Hallucinations: None. GitHub's "Update with rebase" button is real; all git commands describe accurate behavior. ✓ This PR is clean and ready to merge. |
Banks two recurring lessons from the sparta
#143/#150/#152arc intomemories/debugging.md.What
Programmatic comment edits leave punctuation/grammar artifacts. Scripted removal of issue refs (and parentheticals/clauses) from comments repeatedly broke the surrounding prose — orphaned commas/periods, comment-marker-plus-bare-punctuation (
##.), dangling "see issue.", an exposed repeated word. The reviewer/Copilot flagged ~6 of these across #150 and #152. The note lists the failure shapes, the fix for each, and the audit greps — plus which sed patterns strip cleanly vs which cases need hand edits.Merging main into a sibling PR can silently clobber an un-customized file. When one PR merges and you sync a sibling that touches the same files, a file the sibling never customized takes main's version with no conflict — so it can end up describing the wrong change. Hit on ums: add rme/Epi 204 working-notes memory #152, where
demos/demo.jsonsilently became Genericize incidental project-specific references in skills #143's diplomacy reason. The note says to diff the whole merge result vs the PR's intent (not just resolve marked conflicts) and re-run the PR's own invariant over files main re-touched.Why
Both bit this session more than once and weren't recorded anywhere; encoding them should pre-empt the same review rounds next time.
🤖 Generated with Claude Code
Generated by Claude Code