diff --git a/lib/release/finish.rb b/lib/release/finish.rb index 0f0eedc..320184e 100644 --- a/lib/release/finish.rb +++ b/lib/release/finish.rb @@ -27,6 +27,8 @@ module Release git_checkout "master" + #git_merge_message release_branch, "merge #{version_from_release_branch(release_branch)}" + git_local_branch_delete release_branch if remote_branch(release_branch) != "" diff --git a/lib/shared/runnable.rb b/lib/shared/runnable.rb index d75f84e..aa6367f 100644 --- a/lib/shared/runnable.rb +++ b/lib/shared/runnable.rb @@ -84,6 +84,10 @@ module Shared run_cmd "git merge #{branch}" end + def git_merge_message (branch, message) + run_cmd "git merge -m '#{message}' #{branch}" + end + def git_push (branch) run_cmd "git push origin #{branch}" end