diff --git a/.github/mergify.yml b/.github/mergify.yml index c56a0c01ad7..3f6e9f6e078 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -85,10 +85,6 @@ pull_request_rules: - label=merge delay passed - '#approved-reviews-by>=2' - '-label~=^blocked:' - # unlike the others, we need to force this one to be up to date - # because it's intended for when Mergify doesn't have permission - # to rebase - - '#commits-behind=0' # merge+no rebase strategy - actions: @@ -101,6 +97,10 @@ pull_request_rules: - label=merge delay passed - '#approved-reviews-by>=2' - '-label~=^blocked:' + # unlike the others, we need to force this one to be up to date + # because it's intended for when Mergify doesn't have permission + # to rebase + - '#commits-behind=0' # merge strategy for release branches - actions: