class GitCommands::Merge

Merge a branch into base

Public Class Methods

new(base, branch) click to toggle source
Calls superclass method Command::new
# File lib/straight_line/common/git_commands/merge.rb, line 8
def initialize(base, branch)
  super('git')
  arg 'checkout'
  arg base
  merge_command = Command.new('git')
                         .arg('merge --no-ff')
                         .arg(branch)

  sub_command merge_command
end

Public Instance Methods

run(*_args) click to toggle source
Calls superclass method Command#run
# File lib/straight_line/common/git_commands/merge.rb, line 19
def run(*_args)
  super true

rescue ShellError => e
  handle_merge_conflict e
end