diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index 1968abe5..be54722f 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -38,7 +38,7 @@ jobs: run: | for TAG in ${NEW_TAGS}; do git checkout -b release/${TAG} ${TAG} - git rev-list --reverse main ^upstream/main | git cherry-pick --stdin + git rev-list --no-merges --reverse main ^upstream/main | git cherry-pick --stdin git tag -d ${TAG} git tag ${TAG} release/${TAG} done