server: fix testmerge worker action 10

ss220-space · Jul 28, 2024 · 3d95423 · 3d95423
1 parent 3dd4410
commit 3d95423
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/testmerge.yml b/.github/workflows/testmerge.yml
@@ -62,6 +62,7 @@ jobs:
           git config --local user.email "[email protected]"
           git config --local user.name "Testmerge Worker"
           git switch ${{ env.TESTMERGE_BRANCH }} || git switch -c ${{ env.TESTMERGE_BRANCH }}
+          git reset --hard ${{ env.BASE_BRANCH }}
 
           # Print debug information
           echo "PR details JSON:"
@@ -91,4 +92,4 @@ jobs:
             echo "Successfully merged $PR_TITLE (#$PR_NUMBER)"
           done
 
-          git push origin ${{ env.TESTMERGE_BRANCH }}
+          git push -f origin ${{ env.TESTMERGE_BRANCH }}