Skip to content

Commit ddb2169

Browse files
chore: update mergify config (#634)
1 parent faf4ac0 commit ddb2169

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

.mergify.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1+
queue_rules:
2+
- name: default
3+
merge_method: squash
4+
- name: rebase
5+
merge_method: rebase
6+
17
pull_request_rules:
28
- name: Auto Squash and Merge
39
conditions:
410
- base=master
5-
- status-success=ci
6-
- 'label=ready to squash and merge'
11+
- check-success=ci
12+
- label=ready to squash and merge
713
actions:
814
delete_head_branch: {}
9-
merge:
10-
method: squash
11-
strict: smart
15+
queue:
16+
name: default
1217
- name: Auto Rebase and Merge
1318
conditions:
1419
- base=master
15-
- status-success=ci
16-
- 'label=ready to rebase and merge'
20+
- check-success=ci
21+
- label=ready to rebase and merge
1722
actions:
1823
delete_head_branch: {}
19-
merge:
20-
method: rebase
21-
strict: smart
24+
queue:
25+
name: rebase

0 commit comments

Comments
 (0)