Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,28 @@ pull_request_rules:
review:
type: APPROVE

- name: Automatically merge Backport PRs
conditions:
- check-success="dapper-build"
- author = mergify[bot]
- -conflict
actions:
merge:
method: rebase

- name: Ask to resolve conflict
conditions:
- conflict
actions:
comment:
message: This pull request is now in conflict. Could you fix it @{{author}}? 🙏

- name: Automatically approve Backport PRs
conditions:
- check-success="dapper-build"
- author = mergify[bot]
- -conflict
actions:
review:
type: APPROVE
bot_account: harvesterhci-io-github-bot
Loading