From d5e94f1d97927d5f258c6b72408c972d29826881 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 28 Sep 2024 16:14:22 +0100
Subject: [PATCH] [ticket/17394] Merge local 3.3.x and not remote into master

PHPBB-17394
---
 .github/workflows/check_merge_to_master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check_merge_to_master.yml b/.github/workflows/check_merge_to_master.yml
index 810cb8021f..cdae703bd5 100644
--- a/.github/workflows/check_merge_to_master.yml
+++ b/.github/workflows/check_merge_to_master.yml
@@ -35,7 +35,7 @@ jobs:
                 id: merge_master
                 run: |
                     git checkout master
-                    if git merge --no-ff origin/3.3.x --no-commit; then
+                    if git merge --no-ff 3.3.x --no-commit; then
                       echo "mergeable=true" >> $GITHUB_OUTPUT
                     else
                       echo "mergeable=false" >> $GITHUB_OUTPUT