From 6a627670579cb87e57da11d1a2d9786bf90c192d Mon Sep 17 00:00:00 2001
From: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Date: Tue, 18 Oct 2022 11:26:15 -0400
Subject: [PATCH] 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
---
 .github/mergify.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index a53463817cf..7969fe95c25 100644
--- 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