do not dismiss if latest commit was a merge from master

libp2p · Jan 13, 2025 · 7b92caf · 7b92caf
1 parent a05d4aa
commit 7b92caf
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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