lib/hu/deploy.rb in hu-1.3.0 vs lib/hu/deploy.rb in hu-1.3.1

@@ -625,10 +625,10 @@
         # Push final master (#{release_tag}) to staging
         git push heroku master:master -f
 
         # Merge master back into develop
         git checkout develop
-        git merge master
+        git rebase master
         EOS
       end
 
       def abort_merge
         run_each <<-EOS.strip_heredoc