From deb5fe42a6ea5087c60f2cdb8a0270b26d50c87b Mon Sep 17 00:00:00 2001
From: inffy <10782843+inffy@users.noreply.github.com>
Date: Thu, 24 Sep 2026 05:25:46 +0000
Subject: [PATCH] fix(renovate): allow only merge commits to stable branches
 (#2923)

---
 .github/renovate.json5 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index d3ab481f..557a458e 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -22,6 +22,11 @@
     ],
 
   "packageRules": [
+    {
+      "description": "Use merge commits when automerging into stable branches to match branch ruleset restrictions",
+      "matchBaseBranches": ["/^stable-f[0-9][0-9]$/"],
+      "automergeStrategy": "merge-commit"
+    },
     {
       "automerge": true,
       "matchUpdateTypes": ["pin", "pinDigest"]