class Overcommit::Hook::PreCommit::MergeConflicts

Checks for unresolved merge conflicts

Public Instance Methods

run() click to toggle source
# File lib/overcommit/hook/pre_commit/merge_conflicts.rb, line 6
def run
  result = execute(command, args: applicable_files)

  unless result.stdout.empty?
    return :fail, "Merge conflict markers detected:\n#{result.stdout}"
  end

  :pass
end