openapi-generator/bin/utils/detect_merge_conflict.sh
Jérémie Bresson 5340c35ce1
Rename sagger metadata and more (#208)
* Rename groupId, artifactId, project name, title, ...
* Remove .swagger-codegen/VERSION file
2018-04-24 08:08:53 +02:00

18 lines
474 B
Bash
Executable File

#!/bin/bash
# grep for '<<<<<<< HEAD' in openapi-generator
grep -RUIl '<<<<<<< HEAD' modules/openapi-generator/src
if [ $? -ne 1 ]; then
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