https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15048
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #19 from Katrin Fischer <[email protected]> --- Can we please have a rebase? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15048 - subject/genre (650/655) searches fail on searches with $x 'General subdivision' subfield values Applying: Bug 15048: Index all possible searched subfields for index-term-genre Using index info to reconstruct a base tree... M etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml M etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl Falling back to patching base and 3-way merge... Auto-merging etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl CONFLICT (content): Merge conflict in etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl Auto-merging etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml CONFLICT (content): Merge conflict in etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml error: Failed to merge in the changes. Patch failed at 0001 Bug 15048: Index all possible searched subfields for index-term-genre 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-15048-Index-all-possible-searched-subfields-fo-UEZYrg.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/
