Contents

require 'straight_line/common/util'
module GitCommands
  def handle_merge_conflict(e)
    if e.message.match %r[Merge conflict in]
      Util.logger.error %q(***** 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

1 entries across 1 versions & 1 rubygems

Version	Path
straight_line-0.1.1.0	lib/straight_line/common/git_commands.rb