From 4fb06b00b75cf765df78b948873d54dc2177a04d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 17 Sep 2024 22:10:28 +0200
Subject: [PATCH] [ticket/17396] Adjust merge code

PHPBB-17396
---
 .github/workflows/check_merge_to_master.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/check_merge_to_master.yml b/.github/workflows/check_merge_to_master.yml
index 045436ef94..810cb8021f 100644
--- a/.github/workflows/check_merge_to_master.yml
+++ b/.github/workflows/check_merge_to_master.yml
@@ -28,7 +28,8 @@ jobs:
                 id: simulate_merge
                 run: |
                     git checkout 3.3.x
-                    git merge --no-ff ${{ github.event.pull_request.head.sha }} || exit 1
+                    git fetch origin pull/${{ github.event.pull_request.number }}/head
+                    git merge --no-ff FETCH_HEAD || exit 1
 
             -   name: Attempt to merge updated 3.3.x into master
                 id: merge_master