diff --git a/.github/mergify.yml b/.github/mergify.yml index 316be305382..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 @@ -61,9 +63,8 @@ pull_request_rules: queue: queue_rules: - - name: default merge queue + - name: default queue_conditions: - - label=send-it - base=master merge_conditions: [] merge_method: squash