1
0
mirror of https://github.com/fabianonline/telegram_backup.git synced 2024-11-25 18:06:15 +00:00

deploy.sh: Go back to master after merging into stable.

This commit is contained in:
Fabian Schlenz 2018-04-12 06:55:06 +02:00
parent df1c90578b
commit c963a8f334

View File

@ -49,6 +49,9 @@ git checkout stable || error
echo "Merging master into stable..." echo "Merging master into stable..."
git merge --no-ff -m "Merging master into stable for version $VERSION" master || error git merge --no-ff -m "Merging master into stable for version $VERSION" master || error
echo "Checking out master again..."
git checkout master || error
echo "Pushing all to Github..." echo "Pushing all to Github..."
git push --all || error git push --all || error