Skip to content

Commit

Permalink
ci(mergify): inherit the organization's configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
DanySK authored Dec 10, 2023
1 parent e862557 commit d9ef0f8
Showing 1 changed file with 1 addition and 29 deletions.
30 changes: 1 addition & 29 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit d9ef0f8

Please sign in to comment.