Skip to content

Commit

Permalink
[mergify] backport automation to 7.x, 7.12 and 7.11 (#24608)
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v authored Apr 7, 2021
1 parent 3b99e42 commit a2440a6
Showing 1 changed file with 42 additions and 0 deletions.
42 changes: 42 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
pull_request_rules:
- name: backport patches to 7.x branch
conditions:
- merged
- base=master
- label=backport-v7.13.0
actions:
backport:
branches:
- "7.x"
- name: backport patches to 7.12 branch
conditions:
- merged
- base=master
- label=backport-v7.12.0
actions:
backport:
branches:
- "7.12"
- name: backport patches to 7.11 branch
conditions:
- merged
- base=master
- label=backport-v7.11.0
actions:
backport:
branches:
- "7.11"
- name: ask to resolve conflict
conditions:
- conflict
actions:
comment:
message: |
This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
```
git fetch upstream
git checkout -b {{head}} upstream/{{head}}
git merge upstream/{{base}}
git push upstream {{head}}
```

0 comments on commit a2440a6

Please sign in to comment.