Skip to content

merge queue: checking #738 on main (d5803c7) - #760

Closed
mergify[bot] wants to merge 2 commits into
mainfrom
mergify/merge-queue/09b8750710
Closed

mergify[bot] wants to merge 2 commits into
mainfrom
mergify/merge-queue/09b8750710

Conversation

@mergify

@mergify mergify Bot commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

🎉 This pull request has been checked successfully and will be merged soon. 🎉

#738 is queued for merge on branch main (d5803c7).

This pull request has been created by Mergify to check the mergeability of #738.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue rule admin-bypass for merge:

  • check-success = lint
  • check-success = test
  • check-success = validate

Required conditions to stay in the queue:

---
checking_base_sha: d5803c7641167fc870bdbe1958e776af2b1cfb26
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 738
    scopes: []
scopes: []
...

EdbertChan and others added 2 commits September 16, 2026 22:25
The learned rule now covers every merge or rebase, not only whole-side
checkouts: each side's commit messages and PR description (intent and named
tests), each side's code, and the resolved result must agree, and a
mismatch is flagged to the user with history (`why`) and evidence
(`principle-prove-it`) instead of being resolved by choice. Taking a whole
side stays forbidden.

Tests: one real-git case where --theirs drops a non-conflicting hunk, one
where a textually clean merge fails the test a commit declared, and checks
that pin the rule text.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Change-Id: I6c4fab6adcc07aa0e5b2e11a4ea97e08f794e0f3
@mergify mergify Bot closed this Sep 17, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/09b8750710 branch September 17, 2026 05:39
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