Don't let poorly handled conflicts honey badger your repo

pre-commit

#!/bin/bash

# CONFIG
# Give options empty values to bypass checks ("OPTIONNAME=")

# whether to check ig git merge conflicts have been added
CONFLICTS=1

# Simple check for merge conflics
if [[ -n $CONFLICTS ]]; then
  conflicts=`git diff --cached --name-only -G'((<<<<<< HEAD)|(\+======)|(\+>>>>>>))'`

	if [ -n "$conflicts" ]; then
		echo "Unresolved merge conflicts in this commit:"
		echo $conflicts
	fi
fi

# Something went wrong
if [[ -n "$conflicts"  ]]; then
	echo
	echo "Commit with '-n' to bypass checks"
	exit 1
fi