9-fetch: start using fetch

2017-10-07 09:56:56 -04:00
parent 657c88c14e
commit 941aed3389
8 changed files with 25 additions and 9 deletions
--- a/lib/release/finish.rb
+++ b/lib/release/finish.rb
@@ -16,7 +16,7 @@ module Release

      validate_current_branch_is_release

-      git_pull release_branch
+      git_fetch_and_merge release_branch

      update_package_json version_from_release_branch(release_branch)

@@ -25,7 +25,8 @@ module Release
      git_push release_branch
      git_push_tags

-      git_checkout "master"
+      git_checkout 'master'
+      git_fetch_and_merge current_branch

      git_local_branch_delete release_branch