filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This reverts commit d13494aa67.
This commit is contained in:
SpiritCroc 2022-12-15 11:02:24 +01:00
parent 6fc5f6d378
commit f6801a5be0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge_helpers.sh
View File

@ -73,8 +73,7 @@ upstream_common_base() {
# commit="$merged_main" # commit="$merged_main"
#else #else
>&2 echo "ERROR: don't know how to compare main and develop upstream branches" >&2 echo "ERROR: don't know how to compare main and develop upstream branches"
commit="$merged_develop" exit 1
#exit 1
#fi #fi
fi fi
echo "$commit" echo "$commit"