From ce8f9ea3a58dfc4a0017c2430cac17b85b70cba6 Mon Sep 17 00:00:00 2001
From: Akira Komamura <akira.komamura@gmail.com>
Date: Fri, 3 Nov 2023 14:51:31 +0900
Subject: [PATCH] Revert "fixup! ci: Use git-cherry-pick to merge the upstream
 recipe commits"

This reverts commit dafeda98bfe868eeb204db981aae76f852823105.
---
 .github/workflows/merge-upstream.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
index 2a8a90bdcdc..101dd42369f 100644
--- 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