From 16d4a81b79e2f53fd7fee5e60876be949d1c5222 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Mon, 7 Nov 2022 15:27:27 -0500 Subject: [PATCH] Renovate: Override global no-rebase option The `behind-base-branch` setting means: Renovate will rebase whenever the branch falls 1 or more commit behind its base branch Signed-off-by: Chris Evich --- .github/renovate.json5 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 704e7d22..1751e4a7 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -42,6 +42,10 @@ "github>containers/automation//renovate/defaults.json5" ], + // Permit automatic rebasing when base-branch changes by more than + // one commit. + "rebaseWhen": "behind-base-branch", + /************************************************* *** Repository-specific configuration options *** *************************************************/