Skip to content

docs: self-merge PRs by default#389

Merged
danshapiro merged 1 commit into
mainfrom
docs/pr-merge-policy
Jun 4, 2026
Merged

docs: self-merge PRs by default#389
danshapiro merged 1 commit into
mainfrom
docs/pr-merge-policy

Conversation

@danshapiro
Copy link
Copy Markdown
Owner

Updates the documented repo rules to match the agreed policy: everything still goes through a PR, but PRs are merged by default once required checks pass — self-merging your own PR is now the norm. The only PRs left unmerged are ones the user flags as needing someone else's approval first.

Changes (AGENTS.md)

  • Repo Rules: added that everything goes through a PR (no direct pushes to origin/main), and that PRs are self-merged once required checks pass — except when the user says a PR needs outside approval first.
  • Branch Model & Self-Hosting: replaced "We cannot approve our own PRs … origin/main changes still require independent review" with the self-merge-is-the-norm policy.

No code or behavior changes. The GitHub rulesets already enforce this (PR required, required_approving_review_count: 0), so no ruleset change was needed.

🤖 Generated with Claude Code

Reverse the prior "require independent review" policy. Everything still
goes through a PR, but a PR is merged once its required checks pass --
self-merging your own PR is now the norm. The only PRs left unmerged are
ones the user has flagged as needing someone else's approval first.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@danshapiro danshapiro merged commit 56836dd into main Jun 4, 2026
1 check passed
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5f1b9caeba

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread AGENTS.md
- Before creating a new worktree, ensure the repo-supported test suite is green on the intended base. If the suite is not green, pause before creating the worktree and notify the user with the failing command and failure summary.
- New behavior changes start on a worktree branch from `origin/main` and are submitted as PRs to `origin/main`; local `dev` only consumes PR heads.
- Everything goes through a PR — never push behavior changes directly to `origin/main`.
- Merge PRs once their required checks pass; self-merging your own PRs is the norm. The only exception is a PR the user has said needs someone else to approve it first — leave those unmerged.
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Update the branch model docs for self-merge

This new self-merge rule conflicts with the repo's dedicated branch model documentation: docs/development/branch-model.md:33 still says to wait for independent review before merging to origin/main. Agents following that workflow document will continue leaving PRs unmerged even after required checks pass, so the policy update should include that page as well.

Useful? React with 👍 / 👎.

@danshapiro danshapiro deleted the docs/pr-merge-policy branch June 4, 2026 07:52
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.

2 participants