ci: Use rebase

akirak · Nov 4, 2023 · d25521a · d25521a
1 parent 06f3049
commit d25521a
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
@@ -31,15 +31,12 @@ jobs:
         git remote add upstream ${{ matrix.upstream }}
         git fetch upstream ${{ matrix.upstream_branch }}
 
-    - name: Make a temporary branch
-      run: |
-        git switch -C tmp upstream/${{ matrix.upstream_branch }}
-
     - name: Cherry pick commits
       run: |
         git config --add user.name 'github-actions[bot]'
         git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com'
-        git cherry-pick --strategy ort -X theirs ..${{ matrix.base_ref }}
+        git rebase --reapply-cherry-picks --keep-base \
+          upstream/${{ matrix.upstream_branch }}
 
     - name: Push changes
       uses: ad-m/github-push-action@master