From 5aa97150beadf414f19852864de6625afa15e6da Mon Sep 17 00:00:00 2001
From: "Ben Hearsum (he/him)" <bhearsum@mozilla.com>
Date: Mon, 9 Aug 2021 12:40:36 -0400
Subject: [PATCH] [fenix] Don't rebase GeckoView, Android-Components version
 bump or l10n bump PRs before landing
 (https://github.com/mozilla-mobile/fenix/pull/20729)

---
 .mergify.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 2940fe175..1980de742 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -16,7 +16,10 @@ pull_request_rules:
         message: MickeyMoz 💪
       merge:
         method: rebase
-        strict: smart
+        # These PRs are just bumping versions, and very unlikely to break
+        # anything. It's not worth the delay of rebasing them
+        # (sometimes multiple times) before merging.
+        strict: false
   - name: L10N - Auto Merge
     conditions:
       - author=mozilla-l10n-automation-bot
@@ -28,7 +31,10 @@ pull_request_rules:
         message: LGTM 😎
       merge:
         method: rebase
-        strict: smart
+        # These PRs are just bumping versions, and very unlikely to break
+        # anything. It's not worth the delay of rebasing them
+        # (sometimes multiple times) before merging.
+        strict: false
   - name: Release automation (Old)
     conditions:
       - base~=releases[_/].*