Skip to content

Conversation

cgrindel
Copy link
Owner

@cgrindel cgrindel commented Oct 7, 2025

Summary

Adds .mergify.yml configuration to resolve incompatibility between Mergify merge queue and GitHub branch protection setting "Require branches to be up to date before merging" (strict mode).

Changes

  • Add .mergify.yml with merge queue configuration
  • Set max_parallel_checks: 1 to enable in-place checks
  • Set batch_size: 1 for single-PR processing
  • Configure identical merge_conditions and queue_conditions
  • Add draft PR exclusion (-draft) to prevent strict mode conflicts
  • Include safety conditions: -closed, -merged, base=main
  • Configure squash merge method for conventional commits
  • Add timeout configurations for queue and CI checks

Post-Merge Verification

After merging, verify on subsequent PRs:

  • Mergify no longer shows configuration compatibility errors
  • Automatic merge queue works on approved PRs
  • Draft PRs are excluded from queue
  • Status checks are properly enforced

Fixes the issue reported in #1853

🤖 Generated with Claude Code

@cgrindel cgrindel self-assigned this Oct 7, 2025
Add .mergify.yml to resolve incompatibility with branch protection setting
"Require branches to be up to date before merging". Configuration sets
max_parallel_checks: 1, batch_size: 1, and identical merge/queue conditions
to enable in-place checks.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
@cgrindel cgrindel marked this pull request as ready for review October 7, 2025 14:54
@cgrindel cgrindel merged commit 28fa280 into main Oct 7, 2025
34 of 36 checks passed
@cgrindel cgrindel deleted the fix_mergify branch October 7, 2025 14:55
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