Merge pull request #10505 from haskell/mergify-wrong-ncommits

move ncommits check to correct place
haskell · Nov 3, 2024 · 48d2306 · 48d2306
2 parents ee3c313 + 4433a9e
commit 48d2306
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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: