-
Notifications
You must be signed in to change notification settings - Fork 811
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* For backport to iron and humble * Asking to fix conflicts * Deleting head branch after merge Signed-off-by: Ryan <[email protected]>
- Loading branch information
Showing
1 changed file
with
36 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
--- | ||
pull_request_rules: | ||
- name: backport to iron at reviewers discretion | ||
conditions: | ||
- base=rolling | ||
- label=backport-iron | ||
actions: | ||
backport: | ||
branches: | ||
- iron | ||
|
||
- name: backport to humble at reviewers discretion | ||
conditions: | ||
- base=rolling | ||
- label=backport-humble | ||
actions: | ||
backport: | ||
branches: | ||
- humble | ||
|
||
- name: delete head branch after merge | ||
conditions: | ||
- merged | ||
actions: | ||
delete_head_branch: | ||
|
||
- name: ask to resolve conflict | ||
conditions: | ||
- conflict | ||
- author!=mergify | ||
actions: | ||
comment: | ||
message: This pull request is in conflict. Could you fix it @{{author}}? | ||
|
||
# TODO enable automatic merge of backports | ||
# https://docs.mergify.com/workflow/actions/backport/#combining-automatic-merge |