Class: Overcommit::Hook::PreCommit::MergeConflicts

Inherits:
Base
  • Object
show all
Defined in:
lib/overcommit/hook/pre_commit/merge_conflicts.rb

Overview

Checks for unresolved merge conflicts

Instance Attribute Summary

Attributes inherited from Base

#config

Instance Method Summary collapse

Methods inherited from Base

#applicable_files, #command, #description, #enabled?, #execute, #execute_in_background, #flags, #in_path?, #included_files, #initialize, #name, #parallelize?, #processors, #quiet?, #required?, #required_executable, #required_libraries, #run?, #run_and_transform, #skip?

Constructor Details

This class inherits a constructor from Overcommit::Hook::Base

Instance Method Details

#run ⇒ Object 



6
7
8
9
10
11
12
13
14
 
# 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