File tree Expand file tree Collapse file tree 1 file changed +18
-8
lines changed Expand file tree Collapse file tree 1 file changed +18
-8
lines changed Original file line number Diff line number Diff line change 11queue_rules :
2- - name : default
3- conditions :
2+ - name : duplicated default from Auto Squash and Merge
3+ queue_conditions :
4+ - base=master
5+ - status-success=ci
6+ - ' label=ready to squash and merge'
7+ merge_conditions :
48 - check-success=ci
5-
9+ merge_method : squash
10+ - name : duplicated default from Auto Rebase and Merge
11+ queue_conditions :
12+ - base=master
13+ - status-success=ci
14+ - ' label=ready to rebase and merge'
15+ merge_conditions :
16+ - check-success=ci
17+ merge_method : rebase
618
719pull_request_rules :
820 - name : Auto Squash and Merge
@@ -12,16 +24,14 @@ pull_request_rules:
1224 - ' label=ready to squash and merge'
1325 actions :
1426 delete_head_branch : {}
15- queue :
16- method : squash
17- name : default
1827 - name : Auto Rebase and Merge
1928 conditions :
2029 - base=master
2130 - status-success=ci
2231 - ' label=ready to rebase and merge'
2332 actions :
2433 delete_head_branch : {}
34+ - name : Auto Rebase and Merge + Auto Squash and Merge
35+ conditions : []
36+ actions :
2537 queue :
26- method : rebase
27- name : default
You can’t perform that action at this time.
0 commit comments