Skip to content

ci: enforce squash merges in Mergify#11006

Open
gustavovalverde wants to merge 1 commit into
mainfrom
agent/pin-mergify-squash
Open

ci: enforce squash merges in Mergify#11006
gustavovalverde wants to merge 1 commit into
mainfrom
agent/pin-mergify-squash

Conversation

@gustavovalverde

Copy link
Copy Markdown
Member

Motivation

Mergify did not specify a merge method, so enabling merge commits in the repository allowed queued PRs to create merge commits. Zebra's merge policy is squash-only.

Refs #10963.

Solution

Set merge_method: squash in the default queue rule so every queue uses the intended strategy explicitly.

Tests

  • Parsed .github/mergify.yml as YAML.
  • Verified the diff has no whitespace errors.

AI Disclosure

  • No AI tools were used in this PR
  • AI tools were used: OpenAI Codex for the configuration change and PR description

PR Checklist

  • The PR title follows conventional commits format: type(scope): description
  • The PR follows the contribution guidelines.
  • This change was discussed in an issue or with the team beforehand.
  • The solution is tested.
  • The documentation and changelogs are up to date.

@mergify

mergify Bot commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

Merge Protections

🟢 Merge protection satisfied — ready to merge.

Show 1 satisfied protection

🟢 📃 Configuration Change Requirements

Mergify configuration change

  • check-success = Configuration changed

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