File tree 1 file changed +14
-10
lines changed
1 file changed +14
-10
lines changed Original file line number Diff line number Diff line change 1
1
queue_rules :
2
2
- name : automerge
3
- conditions :
4
- - check-success=Deprecation_Messages_and_Coverage (3.8)
5
-
6
- pull_request_rules :
7
- - name : automatic merge on CI success and review
8
- conditions :
3
+ queue_conditions :
9
4
- check-success=Deprecation_Messages_and_Coverage (3.8)
10
5
- " #approved-reviews-by>=1"
11
6
- label=automerge
12
7
- label!=on hold
13
- actions :
14
- queue :
15
- name : automerge
16
- method : squash
8
+ merge_conditions :
9
+ - check-success=Deprecation_Messages_and_Coverage (3.8)
10
+ merge_method : squash
11
+
12
+ pull_request_rules :
17
13
- name : backport
18
14
conditions :
19
15
- label=stable backport potential
20
16
actions :
21
17
backport :
22
18
branches :
19
+ <<<<<<< HEAD
23
20
- stable/0.5
21
+ =======
22
+ - stable/0.6
23
+ - name : automatic merge on CI success and review
24
+ conditions : []
25
+ actions :
26
+ queue :
27
+ >>>>>>> 3162fef (ci(mergify): upgrade configuration to current format (#647))
You can’t perform that action at this time.
0 commit comments