diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index 1c6c36525b4..27d2bcb6462 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -46,7 +46,7 @@ jobs: GH_TOKEN: ${{ github.token }} run: | git remote -v - git checkout main -v + git checkout main git pull origin main git merge upstream/main --no-ff --no-edit --allow-unrelated-histories -v git push origin main