From b52a2cf39a94953cd786c07d0fe7c9ee25c2adf3 Mon Sep 17 00:00:00 2001
From: Zeeshan Ali Khan <zeeshan_ali.khan@mercedes-benz.com>
Date: Mon, 19 Feb 2024 13:12:24 +0100
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96=20Renovate=20to=20automerge=20?=
 =?UTF-8?q?non-major=20updates=20to=20dependencies?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/renovate.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/renovate.json b/.github/renovate.json
index 241a2db..4e65744 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -9,6 +9,10 @@
       "commitMessagePrefix": "⬆️  ",
       "commitMessageTopic": "{{depName}}",
       "lockFileMaintenance": { "enabled": true }
+    },
+    {
+      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
+      "automerge": true
     }
   ]
 }

From 62002d16456bf1d01843c4f6cfda3f234a0578d6 Mon Sep 17 00:00:00 2001
From: Zeeshan Ali Khan <zeeshan_ali.khan@mercedes-benz.com>
Date: Mon, 19 Feb 2024 13:19:28 +0100
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=20renovate:=20Only=20update=20?=
 =?UTF-8?q?branch=20in=20case=20of=20conflicts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renovate defaults to `behind-base-branch` strategy if automerge is
enabled (which we do now for non-major update). We don't need
unnecessary rebasing when there are no conflicts.
---
 .github/renovate.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/renovate.json b/.github/renovate.json
index 4e65744..0f34c61 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -13,6 +13,9 @@
     {
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
       "automerge": true
+    },
+    {
+      "rebaseWhen": "conflicted"
     }
   ]
 }