fix: Update github workflow

smartive · Aug 8, 2024 · 9d0dde5 · 9d0dde5
1 parent de815ef
commit 9d0dde5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml
@@ -47,8 +47,8 @@ jobs:
       run: |
         git log --oneline -n 30
         git pull origin main
-        git merge upstream/main --no-ff --no-edit --allow-unrelated-histories -v
-        git push origin main
+        git rebase upstream/main
+        git push origin main --force-with-lease
 
     - name: Check and update package.json name field if needed
       if: steps.get_latest_tag_origin.outputs.latest_tag != steps.get_latest_tag.outputs.latest_tag