try with a different set of commands

dan-mm · Jul 21, 2023 · 19b696d · 19b696d
1 parent 3a511ff
commit 19b696d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/update_fork.yml b/.github/workflows/update_fork.yml
@@ -30,9 +30,9 @@ jobs:
           CHANGES=$(git rev-list HEAD..upstream/main --count)
           if [ "$CHANGES" -gt 0 ]; then
             echo "Updating fork..."
-            git config pull.rebase true
-            git pull upstream main
-            git push origin main
+            git checkout main
+            git merge upstream/main
+            git push
           else
             echo "No updates from the original repository."
           fi