Skip to content

Commit 00ec401

Browse files
Fix mergify rules (#241)
1 parent 641c929 commit 00ec401

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.github/mergify.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ pull_request_rules:
1717
comment:
1818
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?
1919

20-
- name: development targets master branch
20+
- name: development targets ros2-master branch
2121
conditions:
22-
- base!=master
22+
- base!=ros2-master
2323
- author!=bmagyar
2424
- author!=destogl
2525
- author!=christophfroehlich
@@ -29,6 +29,6 @@ pull_request_rules:
2929
actions:
3030
comment:
3131
message: |
32-
@{{author}}, all pull requests must be targeted towards the `master` development branch.
33-
Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
32+
@{{author}}, all pull requests must be targeted towards the `ros2-master` development branch.
33+
Once merged into `ros2-master`, it is possible to backport to `{{base}}`, but it must be in `ros2-master`
3434
to have these changes reflected into new distributions.

0 commit comments

Comments
 (0)