File tree 1 file changed +18
-8
lines changed
1 file changed +18
-8
lines changed Original file line number Diff line number Diff line change 1
1
queue_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 :
4
8
- 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
6
18
7
19
pull_request_rules :
8
20
- name : Auto Squash and Merge
@@ -12,16 +24,14 @@ pull_request_rules:
12
24
- ' label=ready to squash and merge'
13
25
actions :
14
26
delete_head_branch : {}
15
- queue :
16
- method : squash
17
- name : default
18
27
- name : Auto Rebase and Merge
19
28
conditions :
20
29
- base=master
21
30
- status-success=ci
22
31
- ' label=ready to rebase and merge'
23
32
actions :
24
33
delete_head_branch : {}
34
+ - name : Auto Rebase and Merge + Auto Squash and Merge
35
+ conditions : []
36
+ actions :
25
37
queue :
26
- method : rebase
27
- name : default
You can’t perform that action at this time.
0 commit comments