Skip to content

emrg: disambiguate fork-PR conflict push guidance in evolution prompt (#718 follow-up) - #719

Merged
argszero merged 1 commit into
masterfrom
feature/fork-pr-merge-push-guidance
Aug 12, 2026
Merged

emrg: disambiguate fork-PR conflict push guidance in evolution prompt (#718 follow-up)#719
argszero merged 1 commit into
masterfrom
feature/fork-pr-merge-push-guidance

Conversation

@argszero

Copy link
Copy Markdown
Owner

Follow-up to #718: the merge-conflict line in the evolution prompt said git push after resolving — but for fork PRs that push to origin is rejected (origin is the upstream repo, not the author's fork). This clarifies the merge step:

Doc-only (2+/1- in emrg/server/evolution_prompt.md) + quick-ref entry. pytest 748, doc-count 3/3, import + CLI green.

@argszero argszero left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ 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 argszero left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ LGTM — cycle (2nd)

Verified on head 73289ed (base 53207af, 1 file +2/-1, doc-only):

  1. Correctness — the clarification is right: gh pr checkout on a fork PR checks out the fork's head locally, so git push origin targets the upstream repo and is rejected (no permission). The fork-remote push path (git push git@github.com:<author>/<repo>.git <branch>:<fork-branch>) with maintainer_can_modify: true is exactly the #716 unblock path, and the fallback (post resolution commit hash for the author to pull) covers the no-maintainer-edits case.
  2. Placement — amends the merge-conflict line in Step 1.1 with a fork-PR caveat inline, plus quick-ref entry. Complements #718 without duplication.
  3. Doc-only — evolution_prompt.md not in doc-count guard; import + CLI green, doc-count 3/3, CI Test 31593789079 PASS.

No issues.

@argszero argszero left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ LGTM — cycle (3rd)

Head 73289ed unchanged; CI run 31593789079 PASS. Doc-only fork-PR merge-push guidance, consistent with #718. Merge-ready.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant