Skip to content

Add draft PR guidance to AGENTS.md #260536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukeelmers merged 2 commits into from
Mar 31, 2026
Merged

Add draft PR guidance to AGENTS.md #260536

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a7a42a
Instruct agents to open draft PRs and merge upstream correctly.
lukeelmers Mar 31, 2026
ad9d69e
Dropped line about merging with main
lukeelmers Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,5 @@ Follow existing patterns in the target area first; below are common defaults.
- Make focused changes; avoid unrelated refactors.
- Update docs and tests when behavior or usage changes.
- Never remove, skip, or comment out tests to make them pass; fix the underlying code.
- Update your branch from `main` with `git merge origin/main` (after fetching). Do not rebase or reset against `main`.

@kobelb kobelb Mar 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I always fetch upstream and merge from main with git merge upstream/main. Is this not what others do?

@kapral18 kapral18 Mar 31, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I use rebase exclusively. For long running PRs you can accumulates hundreds of commits in between your local commits and if you want to cleanup history before presenting to the reviewers it's no a pleasant experience. The "reset against main" is definitely gonna fight with that.

Comment thread
lukeelmers marked this conversation as resolved.
Outdated
- Always open PRs as draft.
Loading