Update run-sync-script.yaml

SalamLang · Jan 13, 2025 · 2e132d5 · 2e132d5
1 parent bff338d
commit 2e132d5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/run-sync-script.yaml b/.github/workflows/run-sync-script.yaml
@@ -54,8 +54,9 @@ jobs:
           git config --global user.email "$EMAIL"
 
           git checkout -b auto-sync-update || git checkout auto-sync-update
-          git pull origin auto-sync-update || echo "Branch does not exist on remote, skipping pull."
 
+          # Pull the remote changes and specify the merge strategy
+          git pull origin auto-sync-update --rebase || echo "Rebase failed, performing merge instead."
           git add -A
           git commit -m "Auto-sync: Update after running sync.py script" || echo "No changes to commit."