emrg: disambiguate fork-PR conflict push guidance in evolution prompt (#718 follow-up) - #719
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 follow-up to #718: merge-conflict guidance now distinguishes fork PRs (push to the fork remote via maintainer_can_modify, or post the resolution commit for the author to pull) from same-repo PRs (push to origin). pytest 748, doc-count 3/3, import + CLI green. CI run 31593789079 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 73289ed (base 53207af, 1 file +2/-1, doc-only):
- Correctness — the clarification is right:
gh pr checkouton a fork PR checks out the fork's head locally, sogit push origintargets the upstream repo and is rejected (no permission). The fork-remote push path (git push git@github.com:<author>/<repo>.git <branch>:<fork-branch>) withmaintainer_can_modify: trueis exactly the #716 unblock path, and the fallback (post resolution commit hash for the author to pull) covers the no-maintainer-edits case. - Placement — amends the merge-conflict line in Step 1.1 with a fork-PR caveat inline, plus quick-ref entry. Complements #718 without duplication.
- Doc-only — evolution_prompt.md not in doc-count guard; import + CLI green, doc-count 3/3, CI Test 31593789079 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.
Follow-up to #718: the merge-conflict line in the evolution prompt said
git pushafter resolving — but for fork PRs that push tooriginis rejected (origin is the upstream repo, not the author's fork). This clarifies the merge step:refs/pull/N/head, resolve locally, push to the fork remote (git push git@github.com:<author>/<repo>.git <branch>:<fork-branch>) whenmaintainer_can_modify: true(the emrg: repair stale emrg projects.yml entry + harden scheduler tests against home pollution #716 path)Doc-only (2+/1- in
emrg/server/evolution_prompt.md) + quick-ref entry. pytest 748, doc-count 3/3, import + CLI green.