diff --git a/.github/workflows/sync-main.yml b/.github/workflows/sync-main.yml index 43242eb9093..39b19d3879e 100644 --- a/.github/workflows/sync-main.yml +++ b/.github/workflows/sync-main.yml @@ -46,7 +46,7 @@ jobs: run: | echo "::group::Sync with main branch" git pull origin auto/sync-main-pr; exitCode=$?; if [ $exitCode -ne 0 ]; then exitCode=0; fi - git pull origin main + git pull origin main --rebase git push --force origin auto/sync-main-pr echo "::endgroup::" - name: Sync upstream/codeql-cli/latest