class OctoMerge::Strategy::MergeWithoutRebase

Public Instance Methods

run() click to toggle source
# File lib/octo_merge/strategy/merge_without_rebase.rb, line 4
def run
  fetch_master

  pull_requests.each do |pull_request|
    fetch(pull_request)
    merge(pull_request)

    git.delete_branch(pull_request.number_branch)
  end
end

Private Instance Methods

merge(pull_request) click to toggle source
# File lib/octo_merge/strategy/merge_without_rebase.rb, line 17
def merge(pull_request)
  message = "Merge remote branch '#{pull_request.remote}/#{pull_request.remote_branch}'"

  git.merge_no_ff("-m \"#{message}\" #{pull_request.number_branch}")
end