Don't commit conflicts

.githookspre-commit

#!/usr/bin/env ruby

`git diff-index --name-status HEAD`.split("\n").each do
|status_with_filename|
  status, filename = status_with_filename.split(/\s+/)
  next if status == 'D'
  File.open(filename) do |file|
    while line = file.gets
      if line.include?("<<<<<<<") || line.include?(">>>>>>>")
        puts "ERROR: #{filename} has unresolved conflicts"
        puts "Continue (type 'yes')?"
        if gets.chomp == "yes"
          next
        else
          exit(1)
        end
      end
    end
  end
end