Skip to content

Commit

Permalink
ci(mergify): disable auto-rebasing due to Mergifyio/mergify#5074
Browse files Browse the repository at this point in the history
  • Loading branch information
DanySK authored Mar 20, 2023
1 parent e692aee commit 1dc3448
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
pull_request_rules:
- name: Auto-rebase if appropriately labeled
conditions:
- label=auto-update-rebase
- -draft
- -conflict
actions:
rebase:
- name: Auto-update with merge if appropriately labeled
conditions:
- label=auto-update-merge
Expand All @@ -15,7 +8,11 @@ pull_request_rules:
update:
- name: rebase-merge working updates
conditions:
- author=renovate[bot]
- or: &authors_are_bots
- author=renovate[bot]
- author=dependabot[bot]
- "#review-threads-unresolved=0"
- "#commits-behind=0"
- label=dependencies
- -draft
- -conflict
Expand All @@ -29,6 +26,6 @@ pull_request_rules:
comment:
message: |
Hi @{{author}}! :wave:
I could not help but notice that this pull request has conflicts. :confounded:
This pull request has conflicts :confounded:
Could you fix it? :wrench:
Thank you! :pray:

0 comments on commit 1dc3448

Please sign in to comment.