From 1db43221c3743bee2c5623fca2c66d00a856c5be Mon Sep 17 00:00:00 2001 From: jrfnl Date: Wed, 5 Jun 2024 11:41:06 +0200 Subject: [PATCH] GH Actions/merge conflicts: also check PRs for the 4.0 branch Based on the logging, the PRs for the 4.0 branch are not checked on pushes. Let's enable that. --- .github/workflows/label-merge-conflicts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/label-merge-conflicts.yml b/.github/workflows/label-merge-conflicts.yml index 2a435b736d..6eac6fc86b 100644 --- a/.github/workflows/label-merge-conflicts.yml +++ b/.github/workflows/label-merge-conflicts.yml @@ -5,6 +5,7 @@ on: push: branches: - master + - 4.0 # Check conflicts in new PRs and for resolved conflicts due to an open PR being updated. pull_request_target: types: