diff --git a/.github/workflows/sync-main.yml b/.github/workflows/sync-main.yml index cd20f2b9a6b..53013783867 100644 --- a/.github/workflows/sync-main.yml +++ b/.github/workflows/sync-main.yml @@ -30,10 +30,11 @@ jobs: run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - git checkout -b sync-main-pr + git checkout -B sync-main-pr origin/sync-main-pr echo "::group::Fetch" git pull origin sync-main-pr; exitCode=$?; if [ $exitCode -ne 0 ]; then exitCode=0; fi + git config pull.rebase true git pull origin main git push --force origin sync-main-pr echo "::endgroup::"