merge queue: checking #738 on main (d5803c7) - #760
Closed
mergify[bot] wants to merge 2 commits into
Closed
mergify[bot] wants to merge 2 commits into
mergify[bot] wants to merge 2 commits into
Conversation
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
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎉 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-bypassfor merge:check-success = lintcheck-success = testcheck-success = validateRequired conditions to stay in the queue:
-draftbase=mainlabel=admin-bypass