diff options
| -rwxr-xr-x | build-root/scripts/checkstyle.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build-root/scripts/checkstyle.sh b/build-root/scripts/checkstyle.sh index f2f118ca20d..58f67154114 100755 --- a/build-root/scripts/checkstyle.sh +++ b/build-root/scripts/checkstyle.sh @@ -72,6 +72,11 @@ cd ${VPP_DIR} git status for i in ${FILELIST}; do if [ -f ${i} ] && [ ${i} != "build-root/scripts/checkstyle.sh" ] && [ ${i} != "extras/emacs/fix-coding-style.el" ]; then + grep -q '>>>>>>>' ${i} + if [ $? == 0 ]; then + echo "Unresolved merge conflict detected in" ${i} "... Abort." + exit 1 + fi grep -q "fd.io coding-style-patch-verification: ON" ${i} if [ $? == 0 ]; then EXTENSION=`basename ${i} | sed 's/^\w\+.//'` |