From f6801a5be038a3643de837d102e4f09ec64be0b0 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 15 Dec 2022 11:02:24 +0100
Subject: [PATCH] Revert "[TMP] merge_helpers.sh: Hardcode develop branch"

This reverts commit d13494aa67e1384eba474b0a0febe8419c795794.
---
 merge_helpers.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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