1
0
Fork 0
mirror of synced 2024-06-29 19:41:03 +12:00

Update pro install script to checkout base branch only when feature branch doesn't exist

This commit is contained in:
Rory Powell 2022-04-26 17:55:33 +01:00
parent 716eab5d10
commit 18410ebe91

View file

@ -20,8 +20,12 @@ if [[ -d "budibase-pro" ]]; then
# Try to checkout the matching pro branch # Try to checkout the matching pro branch
git checkout $BRANCH git checkout $BRANCH
# Try to checkout the matching pro base (master or develop) branch
git checkout $BASE_BRANCH if [[ $? == "1" ]] && [[ $BASE_BRANCH ]]; then
# There is no matching branch, try to match the base branch
git checkout $BASE_BRANCH
fi
# If neither branch exists continue with default branch 'develop' # If neither branch exists continue with default branch 'develop'
git pull git pull