class Leg::Commands::Resolve
Public Class Methods
name()
click to toggle source
# File lib/leg/commands/resolve.rb, line 4 def self.name "resolve" end
summary()
click to toggle source
# File lib/leg/commands/resolve.rb, line 8 def self.summary "Continue rewriting steps after resolving a merge conflict." end
usage()
click to toggle source
# File lib/leg/commands/resolve.rb, line 12 def self.usage "" end
Public Instance Methods
run()
click to toggle source
# File lib/leg/commands/resolve.rb, line 19 def run needs! :config, :repo if @git.resolve! git_to_litdiff! output "Success!\n" else output "Looks like you've got a conflict to resolve!\n" end end
setopts!(o)
click to toggle source
# File lib/leg/commands/resolve.rb, line 16 def setopts!(o) end