#!/usr/bin/env bash source "$(dirname "$BASH_SOURCE")/.validate" # folders=$(find * -type d | egrep -v '^Godeps|bundles|.git') IFS=$'\n' files=( $(validate_diff --diff-filter=ACMR --name-only -- '*' | grep -v '^vendor/' || true) ) unset IFS badFiles=() for f in "${files[@]}"; do if [ $(grep -r "^<<<<<<<" $f) ]; then badFiles+=( "$f" ) continue fi if [ $(grep -r "^>>>>>>>" $f) ]; then badFiles+=( "$f" ) continue fi if [ $(grep -r "^=======$" $f) ]; then badFiles+=( "$f" ) continue fi set -e done if [ ${#badFiles[@]} -eq 0 ]; then echo 'Congratulations! There is no conflict.' else { echo "There is trace of conflict(s) in the following files :" for f in "${badFiles[@]}"; do echo " - $f" done echo echo 'Please fix the conflict(s) commit the result.' echo } >&2 false fi