diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index afe2340e3e..c9bb035c53 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,5 @@ -# [1.0.0-rc.2 Transpiled Suspenders](https://github.com/teradata/covalent/compare/v1.0.0-rc.1...v1.0.0-rc.2) (2018-01-06) +# [1.0.0-rc.2 Transpiled Suspenders](https://github.com/teradata/covalent/compare/v1.0.0-rc.1...v1.0.0-rc.2) (2018-01-05) Kicking off the year with our RC.2 release! diff --git a/scripts/finish-release b/scripts/finish-release index a84c067a55..68ed0d3a41 100644 --- a/scripts/finish-release +++ b/scripts/finish-release @@ -19,7 +19,8 @@ git push origin develop echo "Pushing changes into master" git checkout master -git merge --no-ff develop +git merge develop +git push origin master echo "Return to develop branch" git checkout develop