Repository navigation
Merge queue: squash again; merge settings as code keep squash allowed - #9
Merged
Merged
Conversation
#8 switched the queue to merge commits and disallowed squash, which changed how every pull request lands. That was not approved: regular pull requests squash. This restores the queue's SQUASH method and cocoindex-plus's merge settings as they were before #8 (squash and merge commits allowed, no rebase, merge commits titled by GitHub's default message), and keeps them as code in rulesets/repo-settings.json so apply_rulesets.py restores them. CI.md goes back to the squash queue with the admin merge for a pull request that must keep its merge commit. A guard that keeps such a pull request out of the queue follows separately. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
Summary
Reverts the merge method change from #8: regular pull requests squash, and that is not to change.
rulesets/repo/merge-queue.json:merge_methodback toSQUASH.rulesets/repo-settings.json: cocoindex-plus's merge settings as they were before Merge queue: land every pull request as a merge commit; allow only merge commits #8: squash and merge commits allowed (merge commits for the admin merge of an upstream merge), no rebase,merge_commit_title: MERGE_MESSAGE,merge_commit_message: PR_TITLE. Kept as code soapply_rulesets.pyrestores them.A guard that keeps a merge-shaped PR out of the squash queue follows in a separate PR.
Test plan
pytest scripts(20 passed). After merge:scripts/apply_rulesets.py, then--checkclean.🤖 Generated with Claude Code