tweaks to actions

robalb · Oct 17, 2024 · 98bb0ff · 98bb0ff
1 parent db1c7c6
commit 98bb0ff
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/deploy_github_pages.yml b/.github/workflows/deploy_github_pages.yml
@@ -26,7 +26,7 @@ jobs:
       run: |
         git fetch origin
         git checkout github_pages_test
-        git merge origin/master
+        git reset --hard origin/master
 
     # Step 4: Install dependencies and build the project
     - name: Install dependencies and build
@@ -52,5 +52,5 @@ jobs:
         git config --local user.email "github-actions[bot]@users.noreply.github.com"
         git add .
         git commit -m "Update GitHub Pages with latest build from master"
-        git push origin github_pages_test
+        git push origin github_pages_test --force