From c54d8c03d54f091d0147292d13615916f3b4b8e2 Mon Sep 17 00:00:00 2001 From: Chuck Grindel Date: Tue, 7 Oct 2025 08:41:05 -0600 Subject: [PATCH] chore: add mergify configuration for merge queue compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .mergify.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 000000000..e79239059 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,27 @@ +queue_rules: + - name: default + batch_size: 1 + merge_conditions: + - check-success=all_ci_tests + - check-success=conventional_commit_check + queue_conditions: + - check-success=all_ci_tests + - check-success=conventional_commit_check + +pull_request_rules: + - name: Automatic merge on approval + conditions: + - check-success=all_ci_tests + - check-success=conventional_commit_check + - "#approved-reviews-by>=1" + - "#changes-requested-reviews-by=0" + - -draft + - -closed + - -merged + - base=main + actions: + queue: + name: default + +merge_queue: + max_parallel_checks: 1