Skip to content

Commit 7dc0a8c

Browse files
authored
Merge pull request #421 from Ryanf55/mergify/Ryanf55/config-update
ci(Mergify): Add initial config
2 parents 274d7c4 + a6f4192 commit 7dc0a8c

File tree

1 file changed

+36
-0
lines changed

1 file changed

+36
-0
lines changed

.github/.mergify.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
pull_request_rules:
3+
- name: backport to iron at reviewers discretion
4+
conditions:
5+
- base=rolling
6+
- label=backport-iron
7+
actions:
8+
backport:
9+
branches:
10+
- iron
11+
12+
- name: backport to humble at reviewers discretion
13+
conditions:
14+
- base=rolling
15+
- label=backport-humble
16+
actions:
17+
backport:
18+
branches:
19+
- humble
20+
21+
- name: delete head branch after merge
22+
conditions:
23+
- merged
24+
actions:
25+
delete_head_branch:
26+
27+
- name: ask to resolve conflict
28+
conditions:
29+
- conflict
30+
- author!=mergify
31+
actions:
32+
comment:
33+
message: This pull request is in conflict. Could you fix it @{{author}}?
34+
35+
# TODO enable automatic merge of backports
36+
# https://docs.mergify.com/workflow/actions/backport/#combining-automatic-merge

0 commit comments

Comments
 (0)