https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=40858
Lucas Gass (lukeg) <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #186778|0 |1 is obsolete| | --- Comment #3 from Lucas Gass (lukeg) <[email protected]> --- Created attachment 186790 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=186790&action=edit Bug 40858: Search merge conflict on files part of the git index Same as bug 34303 and bug 33743, our test suite must parse/process files that are part of the index, not all the other files. It's currently failing on kohadev-db-request.txt that is owned by root. But it's not part of the Koha codebase, this file should not be tested. There were also node_modules and po files that were processed. Test plan: prove t/00-merge-conflict-markers.t must now return gren Signed-off-by: Lucas Gass <[email protected]> -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
