[Koha-bugs] [Bug 26608] Authorities: linked biblios is inconsistent using elasticsearch and QueryAutoTruncate

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26608

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #5 from David Nind <david at davidnind.com> ---
Patch no longer applies 8-(...

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 26608: Elasticsearch - add exact (ext) field type and use it for
linked biblios
Using index info to reconstruct a base tree...
M       Koha/Authorities.pm
M       Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
Auto-merging Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
CONFLICT (content): Merge conflict in
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
Auto-merging Koha/Authorities.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 26608: Elasticsearch - add exact (ext) field type and
use it for linked biblios

-- 
You are receiving this mail because:
You are watching all bug changes.