Compare commits
1 Commits
master
...
rkiel-mast
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa1ee2b470 |
@@ -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) != ""
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user