Skip to content

Commit

Permalink
feat: add support for auto-backports (elastic#4990)
Browse files Browse the repository at this point in the history
  • Loading branch information
kuisathaverat authored and axw committed Apr 30, 2021
1 parent d843705 commit 7c34e38
Showing 1 changed file with 31 additions and 0 deletions.
31 changes: 31 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
pull_request_rules:
- name: ask to resolve conflict
conditions:
- conflict
actions:
comment:
message: |
This pull request is now in conflicts. Could you fix it @{{author}}? 🙏
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}}
```
- name: backport patches to 7.x branch
conditions:
- base=master
- label=v7.13.0
actions:
backport:
branches:
- "7.x"
- name: backport patches to 7.12 branch
conditions:
- base=master
- label=v7.12.0
actions:
backport:
branches:
- "7.12"

0 comments on commit 7c34e38

Please sign in to comment.