Skip to content

Commit 48998b2

Browse files
jmikell821mergify[bot]
authored andcommitted
Update .mergify.yml (#5958)
Adds 8.17.0 to mergify and updates 8.16. (cherry picked from commit a14abe6) # Conflicts: # .mergify.yml
1 parent 18bf9e5 commit 48998b2

File tree

1 file changed

+31
-0
lines changed

1 file changed

+31
-0
lines changed

.mergify.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,37 @@ pull_request_rules:
1313
git merge upstream/{{base}}
1414
git push upstream {{head}}
1515
```
16+
<<<<<<< HEAD
17+
=======
18+
- name: backport patches to 8.17 branch
19+
conditions:
20+
- merged
21+
- base=main
22+
- label=v8.17.0
23+
actions:
24+
backport:
25+
assignees:
26+
- "{{ author }}"
27+
branches:
28+
- "8.x"
29+
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
30+
labels:
31+
- backport
32+
- name: backport patches to 8.16 branch
33+
conditions:
34+
- merged
35+
- base=main
36+
- label=v8.16.0
37+
actions:
38+
backport:
39+
assignees:
40+
- "{{ author }}"
41+
branches:
42+
- "8.16"
43+
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
44+
labels:
45+
- backport
46+
>>>>>>> a14abe67 (Update .mergify.yml (#5958))
1647
- name: backport patches to 8.15 branch
1748
conditions:
1849
- merged

0 commit comments

Comments
 (0)