Skip to content

Commit ed5864e

Browse files
Fix mergify configuration issue:
Mergify won't do its job. Showing this message and disabling the branch protection in GitHub didn't work: Configuration not compatible with a branch protection setting The branch protection setting Require branches to be up to date before merging is not compatible withdraft PR checks. To keep this branch protection enabled, update your Mergify configuration to enable in-place checks: set merge_queue.max_parallel_checks: 1, set every queue rule batch_size: 1, and avoid two-step CI (make merge_conditions identical to queue_conditions). Otherwise, disable this branch protection. Signed-off-by: Jacob Weinstock <[email protected]>
1 parent 6fa3269 commit ed5864e

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

.github/mergify.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
queue_rules:
22
- name: default
3+
batch_size: 1
34
queue_conditions:
45
- base=main
56
- "#approved-reviews-by>=1"
@@ -9,9 +10,13 @@ queue_rules:
910
- label!=do-not-merge
1011
- label=ready-to-merge
1112
merge_conditions:
12-
# Conditions to get out of the queue (= merged)
13-
- check-success=lint
14-
- check-success=test
13+
- base=main
14+
- "#approved-reviews-by>=1"
15+
- "#changes-requested-reviews-by=0"
16+
- check-success='lint'
17+
- check-success='test'
18+
- label!=do-not-merge
19+
- label=ready-to-merge
1520
merge_method: merge
1621
commit_message_template: |
1722
{{ title }} (#{{ number }})
@@ -21,3 +26,5 @@ pull_request_rules:
2126
conditions: []
2227
actions:
2328
queue:
29+
merge_queue:
30+
max_parallel_checks: 1

0 commit comments

Comments
 (0)