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