[Koha-bugs] [Bug 20334] Elasticsearch - Option for escaping slashes in search queries

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply
                 CC|                            |ere.maijala at helsinki.fi

--- Comment #23 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch doesn't apply right now, conflict looks small. Could we get a rebase
please?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 20334 - Option for escaping slashes in search queries
Using index info to reconstruct a base tree...
M       Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
Auto-merging Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
CONFLICT (content): Merge conflict in
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 20334 - Option for escaping slashes in search queries
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-20334---Option-for-escaping-slashes-in-search--Co2Ks4.patch


Also adding Ere here.

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