From bfd24052f91b5a696365060333b2316a3f79f525 Mon Sep 17 00:00:00 2001 From: Akira Komamura Date: Sun, 5 Nov 2023 04:15:31 +0900 Subject: [PATCH] squash! ci: Use rebase --- .github/workflows/merge-upstream.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml index 607f0285f2e..f965dbe6324 100644 --- 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