Revert "[TMP] merge_helpers.sh: Hardcode develop branch"

This reverts commit d13494aa67.
2022-12-15 11:02:24 +01:00 · 2022-12-15 11:02:24 +01:00 · f6801a5be0
parent 6fc5f6d378
commit f6801a5be0
1 changed files with 1 additions and 2 deletions
--- 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"