From d6c790239064c4146d97def8f809f81043e7799c Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Sat, 16 Dec 2023 12:00:57 +0000
Subject: [PATCH] Chore: Change Renovate rebase logic

---
 renovate.json5 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/renovate.json5 b/renovate.json5
index 0459a9f4dd..1a384933a4 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -15,6 +15,10 @@
 	"prConcurrentLimit": 5,
 	"prHourlyLimit": 0,
 
+	// Tell Renovate to rebase only when there's a conflict, otherwise pull
+	// requests never get auto-merged because there are always new changes.
+	"rebaseWhen": "conflicted",
+
 	// It seems we need to delete the branches after merge or else it causes this problem:
 	// https://github.com/renovatebot/renovate/discussions/21256#discussioncomment-5898418
 	"pruneBranchAfterAutomerge": true,