From 846ad61b734ceadc2b9855f019e51923f54f1cc1 Mon Sep 17 00:00:00 2001 From: carlospolop Date: Fri, 29 Aug 2025 12:01:07 +0200 Subject: [PATCH] f --- .github/workflows/build_master.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_master.yml b/.github/workflows/build_master.yml index 81f6341fe..a486a5f99 100644 --- a/.github/workflows/build_master.yml +++ b/.github/workflows/build_master.yml @@ -50,7 +50,9 @@ jobs: git config pull.rebase false # Ensure we're on the target branch and up to date - git pull --ff-only + # Handle force-pushed branches by resetting to origin/master + git fetch origin + git reset --hard origin/master # Choose the file to keep at HEAD: # 1) Prefer freshly built version from book/