From 4433a9ef0157dfc39412d9f7335c45d57d87dc5d Mon Sep 17 00:00:00 2001 From: brandon s allbery kf8nh Date: Sat, 2 Nov 2024 18:24:35 -0400 Subject: [PATCH] move ncommits check to correct place It's on `squash+merge me` but belongs on `merge+no rebase`. Oops! --- .github/mergify.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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: