Skip to content

Commit

Permalink
Fix mergify rules (#241)
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich authored Nov 27, 2024
1 parent 641c929 commit 00ec401
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/mergify.yml
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.

0 comments on commit 00ec401

Please sign in to comment.