No conflicts (#569)

* add script and step to verify stage of makefile

* this commit should fail the build

* build should now pass

* fix typo in excludes for grep

* better output on failure

also removes tilde from initial regex, git does not use tilde in diffs
adds output of filenames with detected regex on failure
This commit is contained in:
Rob j Loranger
2018-08-27 09:48:24 -07:00
committed by Aaron Schlesinger
parent 5c3af51a1d
commit 37f0687761
2 changed files with 23 additions and 0 deletions
+1
View File
@@ -21,6 +21,7 @@ verify:
./scripts/check_gofmt.sh
./scripts/check_golint.sh
./scripts/check_deps.sh
./scripts/check_conflicts.sh
.PHONY: test
test: