Merge branch 'main' of https://github.com/salamlang/salam

SalamLang · Jan 13, 2025 · 90c31e8 · 90c31e8
2 parents b6f6928 + a7fb0ed
commit 90c31e8
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/.github/workflows/run-sync-script.yaml b/.github/workflows/run-sync-script.yaml
@@ -42,6 +42,7 @@ jobs:
             echo "changes=false" >> $GITHUB_ENV
           fi
         shell: bash
+
 
       - name: Commit and create pull request
         if: env.changes == 'true'
@@ -50,12 +51,16 @@ jobs:
           DOMAIN="gmail.com"
           EMAIL="${FIRST_NAME}BaseCode@${DOMAIN}"
 
-          git config --global user.name "Max Base (GitHub Actions)"
           git config --global user.email "$EMAIL"
+          git config --global user.name "Max Base (GitHub Actions)"
+
+          git checkout -b auto-sync-update || git checkout auto-sync-update
+
+          git fetch origin auto-sync-update
+          git merge origin/auto-sync-update --no-ff -m "Auto-sync: Merge with remote changes" || echo "Merge conflicts detected, handling manually."
 
-          git checkout -b auto-sync-update
           git add -A
-          git commit -m "Auto-sync: Update after running sync.py script"
+          git commit -m "Auto-sync: Update after running sync.py script" || echo "No changes to commit."
 
           git push https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git auto-sync-update