class Papa::Command::Git::Merge
Public Class Methods
new(branch_name)
click to toggle source
Calls superclass method
Papa::Command::Base::new
# File lib/papa/command/git/merge.rb, line 7 def initialize(branch_name) @branch_name = branch_name command = "git merge #{@branch_name} --no-ff" super(command) end
Public Instance Methods
cleanup()
click to toggle source
Calls superclass method
Papa::Command::Base#cleanup
# File lib/papa/command/git/merge.rb, line 18 def cleanup super require 'papa/command/git/merge_abort' require 'papa/command/git/checkout' Command::Git::MergeAbort.new.run Command::Git::Checkout.new(current_branch).run end
failure_message()
click to toggle source
Calls superclass method
Papa::Command::Base#failure_message
# File lib/papa/command/git/merge.rb, line 27 def failure_message super message = "Failed to merge #{@branch_name} into #{current_branch}. Merge conflict?" Helper::Output.error message message end
run()
click to toggle source
Calls superclass method
Papa::Command::Base#run
# File lib/papa/command/git/merge.rb, line 13 def run current_branch # Store current branch before executing command super end