From 3bdae386132baddf61051e4a8197a3a9dea88b32 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Tue, 5 Sep 2023 10:43:00 +0200 Subject: [PATCH] Update .mergify.yml --- .mergify.yml | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index a0343084..7e56a844 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,37 +1 @@ -pull_request_rules: - - name: Auto-update with merge if appropriately labeled - conditions: - - label=auto-update-merge - - -draft - - -conflict - actions: - update: - - name: rebase-merge working updates - conditions: - - and: - - or: &authors_are_bots - - author=renovate[bot] - - author=dependabot[bot] - - and: - - or: - - check-success=ci-cd / success - - check-neutral=ci-cd / success - - check-skipped=ci-cd / success - - "#review-threads-unresolved=0" - - "#commits-behind=0" - - label=dependencies - - -draft - - -conflict - actions: - merge: - method: rebase - - name: ask to resolve conflict - conditions: - - conflict - actions: - comment: - message: | - Hi @{{author}}! :wave: - This pull request has conflicts :confounded: - Could you fix it? :wrench: - Thank you! :pray: +extends: mergify-config