Skip to content

Commit 7a66afc

Browse files
authored
Merge pull request #1060 from LalatenduMohanty/mergify-exclude-dependabot-rebase
mergify: switch from rebase to update action
2 parents 594716a + 2547bb5 commit 7a66afc

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

.mergify.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,16 @@ pull_request_rules:
7878
merge:
7979
method: merge
8080

81-
- name: Auto-rebase approved PRs that are behind
81+
- name: Auto-update approved PRs that are behind
8282
conditions:
8383
- "-draft"
8484
- "-conflict"
8585
- "#commits-behind>0"
8686
- "base=main"
8787
- "#approved-reviews-by>=1"
88+
- "author!=dependabot[bot]"
8889
actions:
89-
rebase:
90+
update:
9091

9192
- name: Ping author on conflicts
9293
conditions:

0 commit comments

Comments
 (0)