some files have accidental merge marker strings in them ie: '<<<<<<<<<<<<<<', '>>>>>>>>>>>>>>>>' and '================' we should remove these lines, to increase our ability to detect actual merge errors
here's 2 examples... kohaclone/authorities/authorities.pl: 535 # ======================== 536 # MAIN 537: #========================= 538 my $input = new CGI; 539 my $z3950 = $input->param('z3950'); kohaclone/cataloguing/addbiblio.pl: 714 # ======================== 715 # MAIN 716: #========================= 717 my $input = new CGI; 718 my $error = $input->param('error');
'<<<<' or '>>>>' isn't the pattern to look for. What you want is '^<<<<<' and '^>>>>>'. Fortunately, there is already a test for this: t/00-merge-conflict-markers.t. In principle, one could also look for '^=====', but there are a bunch of files that do that legitimately (e.g., the release notes). Since this issue is already handled, in other words, I'm marking this resolved/invalid.