From 7b92cafb7043a91a4e9f49825bf736ea07e33572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= <hello@jxs.pt>
Date: Mon, 13 Jan 2025 11:37:51 +0000
Subject: [PATCH] do not dismiss if latest commit was a merge from master

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

diff --git a/.github/mergify.yml b/.github/mergify.yml
index a0f4bbff927..0d519b38a94 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -19,6 +19,8 @@ pull_request_rules:
       - label=send-it
       - author!=@libp2p/rust-libp2p-maintainers
       - author!=dependabot[bot]
+      # Do not remove approvals if last commit was a merge of master into the branch, required for the PR to be merged.
+      - commits[-1].author!=@libp2p/rust-libp2p-maintainers
     actions:
       dismiss_reviews:
         message: Approvals have been dismissed because the PR was updated after the