# Failed test 'Files should not contain merge markers (./blib/INTRANET_CGI_DIR/tools/scheduler.pl, ./tools/scheduler.pl )' # at t/00-merge-conflict-markers.t line 52. # got: '2' # expected: '0' # Looks like you failed 1 test of 1. t/00-merge-conflict-markers.t ............... 1..1 not ok 1 - Files should not contain merge markers (./blib/INTRANET_CGI_DIR/tools/scheduler.pl, ./tools/scheduler.pl ) Only valid in 21.11
Created attachment 156721 [details] [review] Bug 35009: Remove merge conflict markers from tools/scheduler.pl To test: Confirm tests pass with patch applied t/00-merge-conflict-markers.t Sponsored-by: Catalyst IT
Created attachment 156722 [details] [review] Bug 35009: Remove merge conflict markers from tools/scheduler.pl To test: Confirm tests pass with patch applied t/00-merge-conflict-markers.t Sponsored-by: Catalyst IT Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This should not happen. We have the QA script and a unit test to catch them before the release.
Created attachment 156770 [details] [review] Bug 35009: Remove merge conflict markers from tools/scheduler.pl To test: Confirm tests pass with patch applied t/00-merge-conflict-markers.t Sponsored-by: Catalyst IT Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Have pushed this patch to 21.11.x branch ready for next release
Resolved ?