From 2ddbf3b6da540f059d559076e3e3173a82c768ae Mon Sep 17 00:00:00 2001 From: David Joy Date: Wed, 31 Jul 2024 12:01:18 -0400 Subject: [PATCH] build: Temporarily turn off renovate automerge We still have two repositories to merge into frontend-base: frontend-component-footer and frontend-plugin-framework. If Renovate pushes commits to main while we're trying to pull in hundreds of commits from those repositories, it makes rebasing on top of renovate's commits nearly impossible. For now, let's just turn off auto-merging of renovate commits until we get these repos in. --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 129b49ac..00fcd1f6 100644 --- a/renovate.json +++ b/renovate.json @@ -4,7 +4,7 @@ "config:recommended" ], "patch": { - "automerge": true + "automerge": false }, "rebaseStalePrs": true, "packageRules": [ @@ -17,7 +17,7 @@ { "matchPackagePatterns": ["@edx", "@openedx"], "matchUpdateTypes": ["minor", "patch"], - "automerge": true + "automerge": false } ] }