squash! ci: Use rebase

akirak · Nov 4, 2023 · bfd2405 · bfd2405
1 parent d25521a
commit bfd2405
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
@@ -35,8 +35,7 @@ jobs:
       run: |
         git config --add user.name 'github-actions[bot]'
         git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com'
-        git rebase --reapply-cherry-picks --keep-base \
-          upstream/${{ matrix.upstream_branch }}
+        git rebase -s ort -X theirs upstream/${{ matrix.upstream_branch }}
 
     - name: Push changes
       uses: ad-m/github-push-action@master