Skip to content

Configure protected squash auto-merge - #4

Merged
kixelated merged 4 commits into
mainfrom
setup/merge-queue
Nov 7, 2026
Merged

kixelated merged 4 commits into
mainfrom
setup/merge-queue

Conversation

@kixelated

@kixelated kixelated commented Nov 7, 2026 •

Copy link
Copy Markdown
Collaborator

Document squash auto-merge protected by required Check and up-to-date main. Rerun Check on PR edits so retargeted PRs receive feedback for their new base. The maintainer authorized this repository setup and continued quest-complete/quest-spawn.

GitHub native merge queues are limited to organization-owned repositories; this repository is personal. Use the supported latest-base validation instead of adding an unusable merge-group workflow.

Repository configuration

Auto-merge and merged-branch cleanup are enabled; squash is the only allowed merge method. Main's active ruleset blocks deletion and non-fast-forward updates, requires GitHub Actions Check, and requires the PR branch to be current with main. The administrator escape matches moq's ruleset; the workflow never bypasses protection. The plan PR landed through the normal merge command after its checks and independent review passed. No direct merge was used.

Validation

  • Actionlint passes using the pinned nixpkgs input.
  • Full local nix develop --command quest gate just check passes: rustfmt, clippy, scaffold tests (none yet), and quest validation on 14 documents.
  • git diff --check passes.
  • Repository settings and main ruleset verified through the API.

Public API and wire impact

None. CI event handling and landing instructions only.

Caused by

New requested repository configuration; no earlier PR caused a bug.

Models

Size: M
Implementer: Codex, gpt-6.1-sol, xhigh effort

Review

Round 1: Claude Code, claude-opus-5-5, medium effort, 8/10. Independent review found no blocking findings and verified the repository settings and active ruleset through read-only API calls. The committed implementation matches the applied protection. The T3 review transport did not write this PR record automatically.

Reviewed head: 3700e38. Base: 1958d75. Review session.

Non-blocking notes and dispositions:

  1. PR title/body edits also rerun Check and may cancel an in-progress run. Retained intentionally: checking the base-change condition only at the job level could cancel validation and replace the required result with a skipped job. The reviewer recommended leaving the correct event handling as is.
  2. Applied the reviewer's suggested landing sentence unchanged. The only subsequent change is that exact suggested patch, so the review exemption covers landing head 34607ad.
  3. Administrators retain the same escape as moq. The prohibition on bypassing checks is a workflow rule; no bypass was used.

(Written by GPT-6.1 Sol with xhigh)

@kixelated kixelated changed the title Configure a squash merge queue for main Configure protected squash auto-merge Nov 7, 2026
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
@kixelated
kixelated marked this pull request as ready for review November 7, 2026 17:11
@kixelated
kixelated enabled auto-merge (squash) November 7, 2026 17:11
@kixelated
kixelated merged commit 666ccb1 into main Nov 7, 2026
2 checks passed
@kixelated
kixelated deleted the setup/merge-queue branch November 7, 2026 17:13
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