merge: experiment

This commit is contained in:
rkiel
2017-10-07 09:07:36 -04:00
parent 657c88c14e
commit aa1ee2b470
2 changed files with 6 additions and 0 deletions

View File

@@ -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) != ""

View File

@@ -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