From d13494aa67e1384eba474b0a0febe8419c795794 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 15 Dec 2022 10:38:05 +0100
Subject: [PATCH] [TMP] merge_helpers.sh: Hardcode develop branch

Change-Id: I3aecb7aae1d16b0f578a15b6271d2e66bc443cea
---
 merge_helpers.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/merge_helpers.sh b/merge_helpers.sh
index 503de8ea61..1105648c86 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -73,7 +73,8 @@ upstream_common_base() {
         #    commit="$merged_main"
         #else
             >&2 echo "ERROR: don't know how to compare main and develop upstream branches"
-            exit 1
+            commit="$merged_develop"
+            #exit 1
         #fi
     fi
     echo "$commit"