From 3a6a2c931646f521c63349113c4bf2b21a7c454a Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Sat, 21 Sep 2024 12:17:26 +0200
Subject: [PATCH] chore(renovate): rebaseWhen=conflicted (#31518)

---
 renovate.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/renovate.json b/renovate.json
index b3dce7cf60cd25..3950b9401bc522 100644
--- a/renovate.json
+++ b/renovate.json
@@ -7,6 +7,7 @@
   "prCreation": "immediate",
   "ignorePresets": [":ignoreModulesAndTests"],
   "ignorePaths": ["**/node_modules/**", "**/__fixtures__/**", "test/**"],
+  "rebaseWhen": "conflicted",
   "dockerfile": {
     "semanticCommitType": "build"
   },