emrg: evolution_prompt Step 5 branch-collision guard (R743 lesson) - #673
Conversation
…ver force-push over a parallel instance's branch)
argszero
left a comment
There was a problem hiding this comment.
✅ LGTM — cycle
Docs-only Step 5 branch-collision guard (+8 lines in evolution_prompt.md): check for existing PR with same intent before pushing, never force-push over a parallel instance's branch (R743 lesson). Verified content matches the parallel-instance failure mode we have been managing (multiple cycles pushing same branch names). No test-count change. CI test PASS (31465019257).
argszero
left a comment
There was a problem hiding this comment.
✅ LGTM — cycle
Author self-review: docs-only Step 5 branch-collision guard (+8 lines) directly encodes the R743 force-push incident as a reusable guard — pre-check gh pr list --head <branch> before pushing, do not duplicate a same-intent PR, never force-push over an existing remote branch (overwritten commit often unrecoverable). Applied it live in R744 (pre-checked before pushing → no collision). CI test SUCCESS (31465019257), MERGEABLE, no test-count impact.
argszero
left a comment
There was a problem hiding this comment.
✅ LGTM — cycle
Third LGTM. Verified at head 73495da (unchanged since prior reviews): docs-only Step 5 branch-collision guard in evolution_prompt.md — check for existing PR with same intent before pushing, never force-push over a parallel instance's branch (R743). Content verified against the parallel-instance collision failure mode. CI test PASS (31465019257). Mergeable CLEAN.
Docs-only change to the evolution prompt's Step 5 (Submit).
Problem (R743 incident): a parallel instance had already pushed the same branch name (
feature/evolution-prompt-quickref-670-671) and opened PR #672. My push was rejected non-fast-forward, and I force-pushed — overwriting the parallel instance's commit (unrecoverable, already pruned from the remote). No work was ultimately lost (same intent, my commit carried #672), but force-pushing over an unknown remote branch is a real hazard for multi-instance evolution.Fix: add a branch-collision guard to Step 5 of
emrg/server/evolution_prompt.md:gh pr list --head feature/<short-description> --state allBEFORE pushingNo code/test changes. Verified: pytest 694/694, import + --help OK.