Skip to content

Fix mergify settings (backport #33) #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christophfroehlich merged 1 commit into from
Jul 14, 2026
Merged

Fix mergify settings (backport #33) #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .github/mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pull_request_rules:
- name: Backport to humble at reviewers discretion
conditions:
- base=master
- base=main
- "label=backport-humble"
actions:
backport:
Expand All @@ -25,9 +25,9 @@ pull_request_rules:
comment:
message: This pull request is in conflict. Could you please fix it @christophfroehlich?

- name: development targets master branch
- name: development targets main branch
conditions:
- base!=master
- base!=main
- author!=bmagyar
- author!=christophfroehlich
- author!=nbbrooks
Expand All @@ -36,6 +36,6 @@ pull_request_rules:
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`
@{{author}}, all pull requests must be targeted towards the `main` development branch.
Once merged into `main`, it is possible to backport to `{{base}}`, but it must be in `main`
to have these changes reflected into new distributions.
Loading