Contents

require 'common/command'
require 'common/git_commands'

module GitCommands
  # Merge a branch into base
  class Merge < Command
    include GitCommands
    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

    def run(*args)
      super true

    rescue ShellError => e
      handle_merge_conflict e
    end
  end
end

Version data entries

1 entries across 1 versions & 1 rubygems

Version	Path
straight_line-0.1.0.0	lib/common/git_commands/merge.rb