openapi-generator/bin/utils/detect_merge_conflict.sh

18 lines
474 B
Bash
Raw Normal View History

#!/bin/bash
# grep for '<<<<<<< HEAD' in openapi-generator
2018-03-06 16:20:46 +00:00
grep -RUIl '<<<<<<< HEAD' modules/openapi-generator/src
if [ $? -ne 1 ]; then
2018-03-06 16:20:46 +00:00
echo "modules/openapi-generator/src contain merge conflicts '<<<<<<< HEAD'. Please remove it and try again."
exit 1;
fi
# grep for '<<<<<<< HEAD' in the samples
grep -RUIl '<<<<<<< HEAD' samples/
if [ $? -ne 1 ]; then
echo "samples/ contain merge conflicts '<<<<<<< HEAD'. Please remove it and try again."
exit 1;
fi