We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 2e05e65 commit 71f84b5Copy full SHA for 71f84b5
Makefile
@@ -706,7 +706,16 @@ cpplint:
706
707
ifneq ("","$(wildcard tools/eslint/bin/eslint.js)")
708
lint: jslint cpplint
709
+CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
710
lint-ci: jslint-ci cpplint
711
+ @if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \
712
+ && ! ( find . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \
713
+ exit 0 ; \
714
+ else \
715
+ echo "" >&2 ; \
716
+ echo "Conflict marker detected in one or more files. Please fix them first." >&2 ; \
717
+ exit 1 ; \
718
+ fi
719
else
720
lint:
721
@echo "Linting is not available through the source tarball."
0 commit comments