chore(release): fix release script when merging to master

Teradata · Jan 5, 2018 · d61416d · d61416d
1 parent 0336cb2
commit d61416d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,5 @@
 <a name="1.0.0-rc.2"></a>
-# [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
@@ -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