emrg: document parallel-cycle merge race handling in evolution prompt - #720
Merged
Conversation
argszero
commented
Aug 12, 2026
argszero
left a comment
Owner
Author
There was a problem hiding this comment.
✅ LGTM — cycle (1st)
Doc-only: merge-step guidance now treats already merged from a parallel-cycle merge race as success (verify via mergedAt + master commit), not failure. pytest 748, doc-count 3/3, import + CLI green. CI run 31594288723 PASS.
argszero
commented
Aug 12, 2026
argszero
left a comment
Owner
Author
There was a problem hiding this comment.
✅ LGTM — cycle (2nd)
Verified on head 764d36a (base c2a10d1, 1 file +2/-0, doc-only):
- Accuracy — the race is real and observed this session: parallel cycles merged #716/#717/#719 while this cycle was about to merge; the loser's
gh pr mergefails withalready merged/not mergeable, which is a success signal. The guidance (re-checkgh pr view --json mergedAt, fetch master, verify commit on FETCH_HEAD; only genuine rejection — conflict/CI-fail/❌ — is blocking) matches the actual recoveries. - Placement — inline in the merge-step section of Step 1.1, right after the merge command; quick-ref entry added. No overlap with the #718/#719 fork-PR lines (different failure modes).
- Doc-only — evolution_prompt.md not in doc-count guard; import + CLI green, doc-count 3/3, CI Test 31594288723 PASS.
No issues.
This was referenced Aug 12, 2026
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
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.
Operational lesson from repeated parallel-cycle merges (e.g. #716/#717/#719 were all merged by a parallel cycle while this cycle was about to merge): when two cycles both see 2 LGTMs and both run
gh pr merge, the loser getsalready merged/not mergeable— which is actually a success signal, not a failure. The merge section ofemrg/server/evolution_prompt.mdnow says to verify viagh pr view --json mergedAtand confirm the commit on master before treating it as blocking.Doc-only (2 insertions: merge-step guidance + quick-ref entry). pytest 748, doc-count 3/3, import + CLI green.