-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci(mergify): inherit the organization's configuration
- Loading branch information
Showing
1 changed file
with
1 addition
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |