diff --git a/res/aws_release.sh b/res/aws_release.sh index 26843d9..2e5a395 100755 --- a/res/aws_release.sh +++ b/res/aws_release.sh @@ -4,6 +4,10 @@ cd `dirname $0` cd .. +# switch branch +git checkout aws-dist +git merge master --no-edit + # build and test rm -rf node_modules/ npm cache clear @@ -22,4 +26,7 @@ git add node_modules/ dist/ git commit -m "Update aws-dist" # push to aws -git aws.push \ No newline at end of file +git aws.push + +# switch back to master branch +git checkout master \ No newline at end of file