https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19707
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #8 from Séverine Queune <[email protected]> --- Hi David, Thank you for your dev, it's a useful one so it's natural to be interested by it :) I can't apply it on master branch (17.12.00.040) : 74820 - Bug 19707 - Add new operations for synchronizing Elasticsearch mappings Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19707 - Add new operations for synchronizing Elasticsearch mappings Using index info to reconstruct a base tree... M Koha/SearchEngine/Elasticsearch.pm Falling back to patching base and 3-way merge... Auto-merging Koha/SearchEngine/Elasticsearch.pm CONFLICT (content): Merge conflict in Koha/SearchEngine/Elasticsearch.pm Failed to merge in the changes. Patch failed at 0001 Bug 19707 - Add new operations for synchronizing Elasticsearch mappings The copy of the patch that failed is found in: /var/repositories/koha/.git/rebase-apply/patch -- 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/
