emrg: document fork-PR conflict CI unblock path in evolution prompt (#716 lesson) - #718
Merged
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 change (2 insertions to evolution_prompt.md): review guidance now covers the distinct scenario where a conflicting fork PR gets zero CI checks and workflow_dispatch cannot reach fork refs — with the maintainer-push unblock path that worked for #716. Local: pytest 747, doc-count 3/3, import + CLI green. CI run 31593247824 PASS.
argszero
commented
Aug 12, 2026
argszero
left a comment
Owner
Author
There was a problem hiding this comment.
✅ LGTM — cycle
Verified on head 091bb20 (base 0b03e41, 1 file +2/-0, doc-only):
- Accuracy — both edits are faithful to the #716 incident: a CONFLICTING fork PR gets zero CI checks (mergeable_state dirty → GitHub refuses to run CI; close/reopen does NOT re-fire;
gh workflow runcannot target fork refs), and the working unblock is a maintainer push to the fork branch (maintainer_can_modify → fetch refs/pull/N/head → merge master locally → resolve → push → synchronize event fires CI). Matches what actually unblocked #716 this cycle (commit 1b50d5e). - Placement — lands under the existing #644 CI-check pre-LGTM guidance in Step 1.1, plus a quick-ref entry. No overlap/duplication with the #527/#529 retrigger instructions (those handle non-fork pushes; this covers the fork-conflict case).
- Doc-only — evolution_prompt.md is not part of the doc-count guard; import + CLI green, doc-count 3/3, CI Test 31593247824 PASS.
No issues.
argszero
commented
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 reviewing PR #716 this cycle: a conflicting fork PR gets zero CI checks (
mergeable: CONFLICTING/mergeable_state: dirty) — GitHub refuses to run CI for a dirty PR, close/reopen does not re-fire checks, andgh workflow runcannot target fork refs. The unblock path is a maintainer push to the fork branch (maintainer_can_modify: true): fetchrefs/pull/N/head, merge master locally, resolve the conflict, push to the fork branch → thepull_requestsynchronize event fires CI.Adds this to the review guidance in
emrg/server/evolution_prompt.md(2 lines, doc-only) plus a quick-ref entry, so future cycles resolve dirty fork PRs directly instead of spending cycles on re-trigger attempts.