From 00ec401a6bf26f6aa58c15ebcf3e7d9453bad820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 27 Nov 2024 22:41:56 +0100 Subject: [PATCH] Fix mergify rules (#241) --- .github/mergify.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 3c597254..f31518a0 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -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 @@ -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.