Skip to content

Commit 35d1b8b

Browse files
committed
f
1 parent 3062edd commit 35d1b8b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.github/workflows/build_master.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ jobs:
5050
git config pull.rebase false
5151
5252
# Ensure we're on the target branch and up to date
53-
git pull --ff-only
53+
# Handle force-pushed branches by resetting to origin/master
54+
git fetch origin
55+
git reset --hard origin/master
5456
5557
# Choose the file to keep at HEAD:
5658
# 1) Prefer freshly built version from book/

0 commit comments

Comments
 (0)