mergify: two-day delay should account for the squash label (#8517)

* mergify: two-day delay should account for the squash label * fix or: it needs a colon
haskell · Oct 18, 2022 · 6a62767 · 6a62767
1 parent 93dbdbe
commit 6a62767
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -9,7 +9,9 @@ pull_request_rules:
     name: Wait for 2 days before validating merge
     conditions:
       - updated-at<2 days ago
-      - label=merge me
+      - or:
+        - label=merge me
+        - label=squash+merge me
       - '#approved-reviews-by>=2'
 
   # rebase+merge strategy