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