From f242cb20692f0f6e7a9722975f3a980fac25bc55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Tue, 14 Jul 2026 10:41:32 +0200 Subject: [PATCH] Fix mergify settings (#33) (cherry picked from commit 31caab91b0519da80d9c405051a6910fa69147bc) --- .github/mergify.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index c7cb423..cbd188c 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,7 +1,7 @@ pull_request_rules: - name: Backport to humble at reviewers discretion conditions: - - base=master + - base=main - "label=backport-humble" actions: backport: @@ -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 @@ -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.