From d65f3c0e76d9a06fa25e5dd5bd9652c688176654 Mon Sep 17 00:00:00 2001
From: Arda TANRIKULU <ardatanrikulu@gmail.com>
Date: Wed, 30 Oct 2024 18:12:13 +0300
Subject: [PATCH] Update renovate.json

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

diff --git a/renovate.json b/renovate.json
index 2c0d3c0c0bc37..caf00e11e1b0e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,6 +2,7 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["github>the-guild-org/shared-config:renovate"],
   "automerge": true,
+  "rebaseWhen": "conflicted",
   "major": {
     "automerge": false
   },