From c963a8f3342e1600ea240555622cdbae253ceb6b Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Thu, 12 Apr 2018 06:55:06 +0200 Subject: [PATCH] deploy.sh: Go back to master after merging into stable. --- deploy.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy.sh b/deploy.sh index 730c01c..259018e 100755 --- a/deploy.sh +++ b/deploy.sh @@ -49,6 +49,9 @@ git checkout stable || error echo "Merging master into stable..." 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..." git push --all || error