fix: Update github workflow

smartive · Aug 8, 2024 · e3fea5c · e3fea5c
1 parent efa4d2c
commit e3fea5c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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