Merge pull request phpbb#6723 from marc1706/ticket/17394

[ticket/17394] Merge local 3.3.x and not remote into master
iMattPro · Sep 28, 2024 · d8dc120 · d8dc120
2 parents 914383a + d5e94f1
commit d8dc120
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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