Git pre-commit hook to prevent checking in non-resolved merge conflicts.

pre-commit-hook-merge-conflicts.sh

#!/bin/bash

# Check for merge conflicts

# Tested on Linux and Mac

# Simple check for merge conflics
conflicts=`git diff --cached --name-only -G"<<<<<|=====|>>>>>"`


# Something went wrong
if [[ -n "$conflicts" ]]; then
    echo
    echo "Unresolved merge conflicts in these files:"

    for conflict in $conflicts; do
        echo $conflict
    done;

    exit 1;
fi

exit 0

Awesome! Thank you!

It seems ok.

pre-commit has an official hook for this.

Just add this to your pre-commit-config.yaml

repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v4.4.0
    hooks:
      - id: check-merge-conflict