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

[TMP] merge_helpers.sh: Hardcode develop branch 

Change-Id: I3aecb7aae1d16b0f578a15b6271d2e66bc443cea
This commit is contained in:
SpiritCroc 2022-12-15 10:38:05 +01:00
parent c626100ae1
commit d13494aa67
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge_helpers.sh
View File

@ -73,7 +73,8 @@ 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"
exit 1 commit="$merged_develop"
#exit 1
#fi #fi
fi fi
echo "$commit" echo "$commit"