Revert "fixup! ci: Use git-cherry-pick to merge the upstream recipe c…

…ommits" This reverts commit dafeda9.
akirak · Nov 3, 2023 · ce8f9ea · ce8f9ea
1 parent dafeda9
commit ce8f9ea
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
@@ -67,7 +67,7 @@ jobs:
     - name: Cherry-pick the filtered commits
       run: |
         git switch ${{ matrix.base_ref }}
-        git cherry-pick --skip --strategy ort -X hours ..upstream-recipes
+        git cherry-pick --strategy ort -X hours ..upstream-recipes
 
     - name: Create a pull request
       uses: peter-evans/create-pull-request@v5