https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29921
[email protected] changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #5 from [email protected] --- Bug 29921 - Allow to index in Elasticsearch all records modified since a given date 130594 - Bug 29921: Allow to index in ES all records modified since a given date Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 29921: Allow to index in ES all records modified since a given date Using index info to reconstruct a base tree... M Koha/BiblioUtils.pm Falling back to patching base and 3-way merge... Auto-merging Koha/BiblioUtils.pm CONFLICT (content): Merge conflict in Koha/BiblioUtils.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 29921: Allow to index in ES all records modified since a given date hint: Use 'git am --show-current-patch=diff' to see the failed 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-29921-Allow-to-index-in-ES-all-records-modifie-ZvCefZ.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
