From 8ddcecd3ab1178a654bd579dd48345afc3c21901 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 22 May 2026 13:41:06 -0700 Subject: [PATCH] Less Renovate rebasing --- .github/renovate.json5 | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 4a0cf6a7..c5887cc6 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -4,6 +4,7 @@ "config:best-practices", "helpers:pinGitHubActionDigestsToSemver" ], + "rebaseWhen": "conflicted", // Avoid rebasing after every main update // requirements.oldest.txt pins exist to test against the oldest // supported versions and must not be auto-updated. "ignorePaths": ["**/requirements.oldest.txt"],