gerrit.fd Code Review - vpp.git/commit

author	Dave Barach <[email protected]>
	Fri, 8 May 2020 13:46:17 +0000 (09:46 -0400)
committer	Dave Wallace <[email protected]>
	Sat, 9 May 2020 00:27:35 +0000 (00:27 +0000)
commit	119286ee5280757ba37985097f29337a3c8cf959
tree	f85093443a3a471bdcb9682f31f717a117aea6c2	tree \| snapshot
parent	992109169038ade2755d50c20caa7cab8eb41449	commit \| diff

build: reject merge conflict checkin attempts

Although attempts to build code containing merge conflict markers
USUALLY results in compile errors, this patch adds an explicit check
for the conflict end marker.

If for some unknown reason it's necessary to check in the text
'>>>>>>>', construct it by concatenation: ">>>"">>>>"
or '>>>' + '>>>>' depending on the language involved.

Type: improvement

Signed-off-by: Dave Barach <[email protected]>
Change-Id: Iaad2aa8b87a71137a3bb9a09f7f4159909bf79ab