https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22524 Michal Denar <black23@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #13 from Michal Denar <black23@gmail.com> --- Hi Ere, I get error: Applying: Bug 22524: Fix publication date search with Elasticsearch Applying: Bug 22524: Fix publication date and year search with Elasticsearch Using index info to reconstruct a base tree... M Koha/SearchEngine/Elasticsearch/QueryBuilder.pm M admin/searchengine/elasticsearch/mappings.yaml M t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t Auto-merging Koha/SearchEngine/Elasticsearch/QueryBuilder.pm CONFLICT (content): Merge conflict in Koha/SearchEngine/Elasticsearch/QueryBuilder.pm error: Failed to merge in the changes. Can you rebase it on the top of master. Thank you. -- You are receiving this mail because: You are watching all bug changes.