module GitCommands
Util
class for common git related actions
Public Instance Methods
handle_merge_conflict(e)
click to toggle source
# File lib/straight_line/common/git_commands.rb, line 5 def handle_merge_conflict(e) if e.message =~ /Merge conflict in/ Util.logger.error '***** Hint: this looks like a merge conflict. Try fixing the conflicts, then run `git add .` and then run the previous command again.' end raise e end