From 969a16f91198b0217c0c410d9d8e0c1b6ea47849 Mon Sep 17 00:00:00 2001
From: Marc Pichler <marc.pichler@dynatrace.com>
Date: Mon, 27 May 2024 10:33:11 +0200
Subject: [PATCH] chore(renovate): set releaseWhen to conflicted to improve
 merge-queue behavior (#4730)

---
 renovate.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/renovate.json b/renovate.json
index ca59b57564..ea306ee0b6 100644
--- a/renovate.json
+++ b/renovate.json
@@ -25,6 +25,7 @@
     "enabled": true,
     "schedule": ["before 3am on Monday"]
   },
+  "rebaseWhen": "conflicted",
   "ignoreDeps": ["@opentelemetry/api", "@opentelemetry/resources_1.9.0", "@types/node"],
   "assignees": ["@blumamir", "@dyladan", "@legendecas", "@pichlermarc"],
   "labels": ["dependencies"]