Contents

module PreCommit
  class MergeConflictCheck
    def self.call(staged_files)
      return if staged_files.empty?
      errors = `#{Utils.grep} '<<<<<<<' #{staged_files.join(" ")}`.strip
      return unless $?.success?
      "detected a merge conflict\n#{errors}"
    end
  end
end

Version data entries

5 entries across 5 versions & 1 rubygems

Version	Path
pre-commit-0.11.0	lib/pre-commit/checks/merge_conflict_check.rb
pre-commit-0.10.0	lib/pre-commit/checks/merge_conflict_check.rb
pre-commit-0.9.2	lib/pre-commit/checks/merge_conflict_check.rb
pre-commit-0.9.1	lib/pre-commit/checks/merge_conflict_check.rb
pre-commit-0.9.0	lib/pre-commit/checks/merge_conflict_check.rb