From d60a2399bd2a3bd164d8636dd5b7c4c32e283c56 Mon Sep 17 00:00:00 2001 From: Shripal Jain <101626639+shripal-lean-ix@users.noreply.github.com> Date: Tue, 19 May 2026 16:45:37 +0200 Subject: [PATCH] Revert "Temporarily disable auto and branch merge for Sapphire Madrid (#95)" This reverts commit 22e09b60f93314016e4d30f533acdced99b9d05f. --- renovate-presets/automerge.json5 | 4 ++-- renovate-presets/branch-merge.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/renovate-presets/automerge.json5 b/renovate-presets/automerge.json5 index 8568f66..3c13394 100644 --- a/renovate-presets/automerge.json5 +++ b/renovate-presets/automerge.json5 @@ -18,11 +18,11 @@ Prerequisites for this preset: that do not require a merge queue and thus control automerges in renovate still */ automergeSchedule: ["* 9-13 * * 1-5"], - automerge: false, + automerge: true, automergeType: "pr", automergeStrategy: "auto", // Enable Github automerge (renovate loses control over the merge schedule) - platformAutomerge: false, + platformAutomerge: true, // Create PRs only if the stability days check has passed // This prevents premature PR merges prCreation: "not-pending", diff --git a/renovate-presets/branch-merge.json b/renovate-presets/branch-merge.json index 6bae1d0..da6589b 100644 --- a/renovate-presets/branch-merge.json +++ b/renovate-presets/branch-merge.json @@ -4,7 +4,7 @@ { "matchUpdateTypes": ["minor", "patch", "digest"], "automergeSchedule": ["* 9-13 * * 1-5"], - "automerge": false, + "automerge": true, "automergeType": "branch" } ]