diff --git a/.mergify.yml b/.mergify.yml index dc5a9805..7e56a844 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,29 +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: - - or: &authors_are_bots - - author=renovate[bot] - - author=dependabot[bot] - - label=dependencies - - -draft - - -conflict - actions: - merge: - method: rebase - - name: ask to resolve conflict - conditions: - - conflict - actions: - comment: - message: | - Hi @{{author}}! :wave: - I could not help but notice that this pull request has conflicts. :confounded: - Could you fix it? :wrench: - Thank you! :pray: +extends: mergify-config