Contents

require 'straight_line/common/util'

# Util class for common git related actions
module GitCommands
  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
end

Version data entries

3 entries across 3 versions & 1 rubygems

Version	Path
straight_line-0.1.4.0	lib/straight_line/common/git_commands.rb
straight_line-0.1.3.0	lib/straight_line/common/git_commands.rb
straight_line-0.1.2.0	lib/straight_line/common/git_commands.rb