From da100735b786b58acd371390a4a0f1cb82f3902e Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Fri, 18 Apr 2025 15:13:33 +0800
Subject: [PATCH] feat(GHA): Renovate auto rebase after PR automerge enabled

---
 .github/workflows/renovate-rebase.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/renovate-rebase.yaml b/.github/workflows/renovate-rebase.yaml
index 9b1f9f27..f43b5db2 100644
--- a/.github/workflows/renovate-rebase.yaml
+++ b/.github/workflows/renovate-rebase.yaml
@@ -46,6 +46,7 @@ jobs:
       - name: Git
         shell: bash
         run: |
+          git config pull.rebase false
           git config user.name "${{ secrets.BOT_USERNAME }}[bot]"
           git config user.email "${{ secrets.BOT_USERNAME }} <${{ secrets.BOT_API_ID }}+${{ secrets.BOT_USERNAME }}[bot]@users.noreply.github.com>" # get $BOT_API_ID from `curl -s 'https://api.github.com/users/$(BOT_USERNAME)%5Bbot%5D' | yq .id`
           # echo "CURRENT_PR_SHA=$(git rev-parse --verify HEAD)" >> "${GITHUB_ENV}"