From 1a861c97c7feceab9a8a0f66dcebd493caaa9694 Mon Sep 17 00:00:00 2001 From: Max Base Date: Mon, 13 Jan 2025 22:30:24 +0330 Subject: [PATCH] Update run-sync-script.yaml --- .github/workflows/run-sync-script.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-sync-script.yaml b/.github/workflows/run-sync-script.yaml index b4149764..6e255a45 100644 --- a/.github/workflows/run-sync-script.yaml +++ b/.github/workflows/run-sync-script.yaml @@ -40,7 +40,6 @@ jobs: else echo "No changes detected" echo "changes=false" >> $GITHUB_ENV - fi shell: bash - name: Commit and create pull request @@ -50,14 +49,14 @@ jobs: DOMAIN="gmail.com" EMAIL="${FIRST_NAME}BaseCode@${DOMAIN}" - git config --global pull.rebase true 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 stash - git pull origin auto-sync-update --rebase || echo "Rebase failed, performing merge instead." + 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 add -A git commit -m "Auto-sync: Update after running sync.py script" || echo "No changes to commit."