-
Notifications
You must be signed in to change notification settings - Fork 99
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
358552e
commit b49057b
Showing
2 changed files
with
34 additions
and
4 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,34 @@ | ||
pull_request_rules: | ||
|
||
- name: Ask to resolve conflict | ||
conditions: | ||
- conflict | ||
- author!=mergify[bot] | ||
- author!=dependabot[bot] | ||
actions: | ||
comment: | ||
message: This pull request is in conflict. Could you fix it @{{author}}? | ||
|
||
- name: Ask to resolve conflict for backports | ||
conditions: | ||
- conflict | ||
- author=mergify[bot] | ||
actions: | ||
comment: | ||
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor? | ||
|
||
- name: development targets master branch | ||
conditions: | ||
- base!=master | ||
- author!=bmagyar | ||
- author!=destogl | ||
- author!=christophfroehlich | ||
- author!=saikishor | ||
- author!=mergify[bot] | ||
- author!=dependabot[bot] | ||
actions: | ||
comment: | ||
message: | | ||
@{{author}}, all pull requests must be targeted towards the `master` development branch. | ||
Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master` | ||
to have these changes reflected into new distributions. |
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