From 0b0950c6bb232b3e1b896758feeee72a9ed8e401 Mon Sep 17 00:00:00 2001
From: Meng Sen <qyg2297248353@gmail.com>
Date: Mon, 15 Sep 2025 16:24:51 +0800
Subject: [PATCH] Update renovate.json

---
 .github/renovate.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index d537ecf1d..d2d7920c5 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -7,7 +7,7 @@
   "rebaseWhen": "never",
   "prConcurrentLimit": 20,
   "automerge": true,
-  "automergeType": "pr",
+  "automergeType": "branch",
   "platformAutomerge": true,
   "enabledManagers": [
     "docker-compose",
@@ -36,8 +36,8 @@
         "patch",
         "minor"
       ],
-      "automerge": true,
-      "automergeType": "branch",
+      "automerge": true,   // 显式设置 autormerge
+      "automergeType": "branch",   // 直接分支合并
       "ignoreTests": true
     },
     {