Update force-push.yml

Author: DenisValeev

.github/workflows/force-push.yml

@@ -1,4 +1,4 @@
-name: Merge PR into main (prefer PR changes)
+name: Merge PR into main (force PR changes)
 
 on:
   workflow_dispatch:
@@ -7,7 +7,7 @@ permissions:
   contents: write
 
 jobs:
-  merge-prefer-pr:
+  merge-force-pr:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -37,9 +37,9 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
-      - name: Merge PR branch into main
+      - name: Force main to PR branch
         run: |
           git fetch origin
-          git checkout main
-          git merge -s recursive -X theirs origin/${{ steps.check.outputs.branch }} || true
-          git push origin main
+          git checkout ${{ steps.check.outputs.branch }}
+          git checkout -B main
+          git push origin main --force