From 10d9409be5e40dce1c24c835d98cfb58ddca576b Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sun, 29 Oct 2023 08:10:26 +0100 Subject: [PATCH] build: Update automerge script --- .github/workflows/auto_merge.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto_merge.yaml b/.github/workflows/auto_merge.yaml index cbc5a21e2..7a9e2d5bd 100644 --- a/.github/workflows/auto_merge.yaml +++ b/.github/workflows/auto_merge.yaml @@ -11,4 +11,5 @@ jobs: steps: - uses: reitermarkus/automerge@v2 with: - token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + token: ${{ secrets.GITHUB_TOKEN }} + merge-method: rebase \ No newline at end of file