chore: bump min required approvals for merge to 2

[nathan-weinberg]

Summary by CodeRabbit

• Chores
  • Updated repository auto-merge rules to require two approving reviews (previously one).
  • Disabled automatic conflict pings and “needs-rebase” labeling; contributors should manage conflict resolution proactively.
  • Existing merge checks (e.g., no pending change requests, no review requests, title and pre-commit validations) remain enforced.
  • Base branch restrictions remain unchanged.

[coderabbitai]

Walkthrough

The Mergify configuration was updated to require at least two approving reviews for auto-merge and to remove the rules that ping authors and label conflicts for rebasing. Other conditions and actions remain unchanged.

Changes

Cohort / File(s)	Summary
Mergify configuration .github/mergify.yml	Increased required approvals from >=1 to >=2 for auto-merge; removed conflict-handling rules (ping author, apply/remove needs-rebase label); retained existing conditions and checks (labels, base=main, pre-commit, title-check, review-requested=0, changes-requested-reviews-by=0).

Sequence Diagram(s)

sequenceDiagram
autonumber
actor Dev as Developer
participant GH as GitHub
participant MG as Mergify

Dev->>GH: Open/Update PR
GH-->>MG: PR event (status, labels, reviews)

alt Approvals < 2 or conditions unmet
  MG-->>GH: No merge action (wait)
else Approvals >= 2 and all checks pass
  MG->>GH: Auto-merge PR
end

Loading

sequenceDiagram
autonumber
actor Dev as Developer
participant GH as GitHub
participant MG as Mergify

Dev->>GH: PR develops conflicts
GH-->>MG: PR event (conflict detected)

Note over MG: Previous behavior removed:<br/>no conflict ping<br/>no needs-rebase label changes
MG-->>GH: No conflict-related actions

Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Pre-merge checks (3 passed)

✅ Passed checks (3 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title Check	✅ Passed	The title "chore: bump min required approvals for merge to 2" is concise, uses a standard "chore" prefix, and directly summarizes the main change (raising the required approvals to two), so it clearly communicates the PR's primary intent to reviewers. It is specific and not overly broad or noisy.
Docstring Coverage	✅ Passed	No functions found in the changes. Docstring coverage check skipped.

Poem

I thump my paws—two nods now, please!
Our merge awaits the gentle breeze.
No conflict pings, no rebased fray,
Just quiet checks that clear the way.
Approvals pair, the carrot’s sweet—
Hop, hop—complete! 🥕✨

Tip

👮 Agentic pre-merge checks are now available in preview!

Pro plan users can now enable pre-merge checks in their settings to enforce checklists before merging PRs.

• Built-in checks – Quickly apply ready-made checks to enforce title conventions, require pull request descriptions that follow templates, validate linked issues for compliance, and more.
• Custom agentic checks – Define your own rules using CodeRabbit’s advanced agentic capabilities to enforce organization-specific policies and workflows. For example, you can instruct CodeRabbit’s agent to verify that API documentation is updated whenever API schema files are modified in a PR. Note: Upto 5 custom checks are currently allowed during the preview period. Pricing for this feature will be announced in a few weeks.

Please see the documentation for more information.

Example:

reviews:
  pre_merge_checks:
    custom_checks:
      - name: "Undocumented Breaking Changes"
        mode: "warning"
        instructions: |
          Pass/fail criteria: All breaking changes to public APIs, CLI flags, environment variables, configuration keys, database schemas, or HTTP/GraphQL endpoints must be documented in the "Breaking Change" section of the PR description and in CHANGELOG.md. Exclude purely internal or private changes (e.g., code not exported from package entry points or explicitly marked as internal).

Please share your feedback with us on this Discord post.

✨ Finishing touches

🧪 Generate unit tests

• Create PR with unit tests
• Post copyable unit tests in a comment

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

Actionable comments posted: 0

🧹 Nitpick comments (2)

.github/mergify.yml (2)

11-11: If removing conflict automation, also drop the guard on needs-rebase.

Otherwise the auto-merge rule will keep excluding a label that is never managed.

-    - label!=needs-rebase

---

16-25: Optional: make merges strict to ensure checks run on the exact merge commit.

Prevents edge cases where base advances after the last green run.

     merge:
       method: squash
+      strict: smart+fasttrack

📜 Review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 302ade8 and c759f35.

📒 Files selected for processing (1)

• .github/mergify.yml (1 hunks)

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)

• GitHub Check: build-test-push (linux/amd64)

🔇 Additional comments (2)

.github/mergify.yml (2)

6-6: Two approvals requirement — LGTM; ensure branch protection matches.

Nice, this enforces 2 approvals for auto-merge. Please also bump GitHub’s branch protection for main to require 2 approving reviews so Mergify and the repo policy stay consistent.

---

28-50: Summary mismatch: conflict-labeling rules are still present — confirm intent.

The AI summary says these blocks were removed, but they’re still here. If the intent is to drop conflict ping/labeling, remove this whole section.

Optionally apply:

- - name: ping author on conflicts and add 'needs-rebase' label
-   conditions:
-       - conflict
-       - -closed
-   actions:
-     label:
-       add:
-         - needs-rebase
-     comment:
-       message: >
-        This pull request has merge conflicts that must be resolved before it
-        can be merged. @{{author}} please rebase it.
-        https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
-
- - name: remove 'needs-rebase' label when conflict is resolved
-   conditions:
-       - -conflict
-       - -closed
-   actions:
-     label:
-       remove:
-         - needs-rebase