diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml
index 6cd3b894266..56d720d5c6c 100644
--- a/.github/workflows/fork-sync.yml
+++ b/.github/workflows/fork-sync.yml
@@ -45,7 +45,8 @@ jobs:
       env:
         GH_TOKEN: ${{ github.token }}
       run: |
-        git pull upstream main
+        git checkout main
+        git merge upstream/main --no-ff --no-edit
         git push origin main
 
     - name: Check and update package.json name field if needed