[TMP] merge_helpers.sh: Hardcode develop branch

Change-Id: I3aecb7aae1d16b0f578a15b6271d2e66bc443cea
2022-12-15 10:38:05 +01:00 · 2022-12-15 10:38:05 +01:00 · d13494aa67
parent c626100ae1
commit d13494aa67
1 changed files with 2 additions and 1 deletions
--- 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"