aboutsummaryrefslogtreecommitdiff
path: root/deploy.sh
diff options
context:
space:
mode:
authorjakob.stendahl <jakob.stendahl@infomedia.dk>2023-01-15 22:48:27 +0100
committerJakob Stendahl <jakob.stendahl@outlook.com>2023-01-15 22:51:40 +0100
commitb7b331dd28ff0fb9763c20c8cc65c0c69cf460c8 (patch)
tree26aa014008c2223d27131726e872fd8b33c4c118 /deploy.sh
parentefce298d75214acfcfa5a53d7a5e139157c69ede (diff)
downloadmicrobit-gamepad-b7b331dd28ff0fb9763c20c8cc65c0c69cf460c8.tar.gz
microbit-gamepad-b7b331dd28ff0fb9763c20c8cc65c0c69cf460c8.zip
Fix error in deploy script
Diffstat (limited to 'deploy.sh')
-rwxr-xr-xdeploy.sh11
1 files changed, 0 insertions, 11 deletions
diff --git a/deploy.sh b/deploy.sh
index 9b8ab74..bb3f79b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -53,7 +53,6 @@ git add .
git commit -m ":rocket: Deploy app v$VERSION"
tput setaf 4
-<<<<<<< Updated upstream
echo "> Return to main branch and tag last commit"
tput sgr0
@@ -62,15 +61,5 @@ git checkout main
#git tag "v$VERSION"
git push -f origin main
-=======
-echo "> Return to main branch and tag last commit"
-tput sgr0
-
-git checkout main
-
-#git tag "v$VERSION"
-
-git push -f origin main
->>>>>>> Stashed changes
#git push origin "v$VERSION"
git push origin gh-pages