update release checklist

Upstream-commit: 58f8503b7340ca34b229609a2dcb4b0fede1e638 Component: engine
2013-11-21 18:17:11 -08:00
parent b82d2b8801
commit 21b63b0713
1 changed files with 2 additions and 1 deletions
--- a/components/engine/hack/RELEASE-CHECKLIST.md
+++ b/components/engine/hack/RELEASE-CHECKLIST.md
@ -13,6 +13,7 @@ export VERSION=vXXX
 git checkout release
 git pull
 git checkout -b bump_$VERSION
+git merge master
 ```

 ### 2. Update CHANGELOG.md
@ -79,7 +80,7 @@ git push origin bump_$VERSION
 ### 8. Apply tag

 ```bash
-git tag -a v$VERSION # Don't forget the v!
+git tag -a $VERSION
 git push --tags
 ```