From d5a33e95f3bd9de39d02e5a20dd4aeb5861d8811 Mon Sep 17 00:00:00 2001
From: Mathieu Hofman <86499+mhofman@users.noreply.github.com>
Date: Mon, 28 Aug 2023 19:49:09 -0300
Subject: [PATCH] ci(Mergify): configuration update (#8266)

---
 .mergify.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index 24230f0c3f7..cc29eaca1b3 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -43,6 +43,9 @@ pull_request_rules:
     conditions:
       - base=master
       - label=automerge:no-update
+      - or:
+          - "#commits-behind=0"
+          - label=bypass:linear-history
       - or:
           - check-success=wait-integration-pre-checks
           - label=bypass:integration