From 1b5212dbfdaa20851d0b1556e2d0b4353d1b2d78 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 12 Dec 2023 14:15:03 -0500 Subject: [PATCH] chore: renovate housekeeping Signed-off-by: Devin Buhl --- .github/renovate.json5 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index d644dc2a3acab..07bdc46b8801f 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -25,7 +25,8 @@ "onboarding": false, "requireConfig": "optional", "dependencyDashboardTitle": "Renovate Dashboard 🤖", - "suppressNotifications": ["prIgnoreNotification"], + "suppressNotifications": ["prEditedNotification", "prIgnoreNotification"], + "rebaseWhen": "conflicted", "ignorePaths": [ "**/*.sops.*", "**/.archive/**",