Skip to content
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

Fix mergify rules #241

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Fix mergify rules #241

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
8 changes: 4 additions & 4 deletions .github/mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ pull_request_rules:
comment:
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?

- name: development targets master branch
- name: development targets ros2-master branch
conditions:
- base!=master
- base!=ros2-master
- author!=bmagyar
- author!=destogl
- author!=christophfroehlich
Expand All @@ -29,6 +29,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 `ros2-master` development branch.
Once merged into `ros2-master`, it is possible to backport to `{{base}}`, but it must be in `ros2-master`
to have these changes reflected into new distributions.