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

---
 .github/workflows/merge-upstream.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
index a4dc56ff759..68b9a1e584d 100644
--- a/.github/workflows/merge-upstream.yml
+++ b/.github/workflows/merge-upstream.yml
@@ -64,14 +64,10 @@ jobs:
             commit.committer_date = commit.author_date
           ' --force
 
-    - name: Rebase
-      run: |
-        git rebase -s ort -X ours ${{ steps.start.outputs.rev }}
-
-    - name: Merge into the original branch
+    - name: Cherry-pick the filtered commits
       run: |
         git switch ${{ matrix.base_ref }}
-        git merge --ff upstream-recipes
+        git cherry-pick --strategy ort -X theirs ..upstream-recipes
 
     - name: Create a pull request
       uses: peter-evans/create-pull-request@v5