[Koha-bugs] [Bug 22826] Allow indexing of individual authority records in Elasticsearch

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |katrin.fischer at bsz-bw.de
             Status|Signed Off                  |Patch doesn't apply

--- Comment #3 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch no longer applies (I think with the changes for faster indexing). Can you
please rebase?


Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 22826: Allow indexing of individual authorities in Elasticsearch
Using index info to reconstruct a base tree...
A       misc/search_tools/rebuild_elastic_search.pl
Falling back to patching base and 3-way merge...
Auto-merging misc/search_tools/rebuild_elasticsearch.pl
CONFLICT (content): Merge conflict in
misc/search_tools/rebuild_elasticsearch.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 22826: Allow indexing of individual authorities in
Elasticsearch
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-22826-Allow-indexing-of-individual-authorities-ll6wzg.patch

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