2017-06-29 05:01:40 +00:00
|
|
|
#!/bin/bash
|
|
|
|
|
2018-04-24 06:08:53 +00:00
|
|
|
# grep for '<<<<<<< HEAD' in openapi-generator
|
2018-03-06 16:20:46 +00:00
|
|
|
grep -RUIl '<<<<<<< HEAD' modules/openapi-generator/src
|
2017-06-29 05:01:40 +00:00
|
|
|
|
|
|
|
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."
|
2017-06-29 05:01:40 +00:00
|
|
|
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
|