Merge pull request #2138 from erwinmombay/update-release-script-2

reset canary to master on release script
ampproject · Feb 19, 2016 · 5e1bfa4 · 5e1bfa4
2 parents 1f61fdb + f08a730
commit 5e1bfa4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/build-system/release.sh b/build-system/release.sh
@@ -13,11 +13,9 @@ echo "===================="
 echo "in folder $(pwd)"
 echo "===================="
 
-git checkout canary
+git checkout -B canary master
 
-git merge master
-
-echo "done with merging master into canary"
+echo "done with resetting canary"
 echo "===================="
 
 git checkout release