https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18738
Hayley Mapley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] | |z --- Comment #3 from Hayley Mapley <[email protected]> --- Patch doesn't apply Applying: Bug 18738: Improve failure cases to skip better Using index info to reconstruct a base tree... A t/db_dependent/Koha_Elasticsearch_Indexer.t Falling back to patching base and 3-way merge... CONFLICT (modify/delete): t/db_dependent/Koha_Elasticsearch_Indexer.t deleted in HEAD and modified in Bug 18738: Improve failure cases to skip better. Version Bug 18738: Improve failure cases to skip better of t/db_dependent/Koha_Elasticsearch_Indexer.t left in tree. error: Failed to merge in the changes. Patch failed at 0001 Bug 18738: Improve failure cases to skip better -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
