From 4588c49e84a3e2c1fbe9df9afb260cf9d09651e1 Mon Sep 17 00:00:00 2001
From: Erik Godding Boye <egboye@gmail.com>
Date: Sat, 6 Sep 2025 13:13:56 +0200
Subject: [PATCH] Configure Renovate to rebase stale PRs

Signed-off-by: Erik Godding Boye <egboye@gmail.com>
---
 .github/renovate.json5                              | 2 +-
 modules/repository-base/base/.github/renovate.json5 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 1810a9db..cfa60d7a 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -6,7 +6,6 @@
     'Renovate Bot <renovate-bot@users.noreply.github.com>',
     'cert-manager-bot <cert-manager-bot@users.noreply.github.com>',
   ],
-  recreateWhen: 'always', // TODO: Remove; temporary fix to force Renovate to ignore "foreign" commits
   enabledManagers: [
     'custom.regex',
     'github-actions',
@@ -16,6 +15,7 @@
     'config:best-practices',
     ':gitSignOff',
     ':disableVulnerabilityAlerts',
+    ':rebaseStalePrs',
     ':prConcurrentLimit10', // Set a limit to avoid too many PRs, at least on the first run
     ':prHourlyLimitNone',
   ],
diff --git a/modules/repository-base/base/.github/renovate.json5 b/modules/repository-base/base/.github/renovate.json5
index e728d688..d0dc1c0c 100644
--- a/modules/repository-base/base/.github/renovate.json5
+++ b/modules/repository-base/base/.github/renovate.json5
@@ -9,7 +9,6 @@
     'Renovate Bot <renovate-bot@users.noreply.github.com>',
     'cert-manager-bot <cert-manager-bot@users.noreply.github.com>',
   ],
-  recreateWhen: 'always', // TODO: Remove; temporary fix to force Renovate to ignore "foreign" commits
   enabledManagers: [
     'github-actions',
     'gomod',
@@ -19,6 +18,7 @@
     ':gitSignOff',
     ':semanticCommits',
     ':disableVulnerabilityAlerts',
+    ':rebaseStalePrs',
     ':prConcurrentLimit10', // Set a limit to avoid too many PRs, at least on the first run
     ':prHourlyLimitNone',
   ],