From dbad7015155d7ced67ac67b7fd9915b61ca0ebbb Mon Sep 17 00:00:00 2001
From: Sam Kleinman <garen@tychoish.com>
Date: Fri, 24 Sep 2021 14:59:10 -0400
Subject: [PATCH] ci: use smart merges (#6993)

---
 .github/mergify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index df570504a..6b08c877f 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -6,7 +6,7 @@ pull_request_rules:
     actions:
       merge:
         method: squash
-        strict: true
+        strict: smart+fasttrack
         commit_message: title+body
   - name: backport patches to v0.34.x branch
     conditions: