https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19376
Mazen Khallaf <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #18 from Mazen Khallaf <[email protected]> --- Could not apply patch git bz apply 19376 Bug 19376 - Add 655$a (Genre/Form) to zebra search facets 84383 - Bug 19376 - Adds 655$a to Zebra facets 84384 - Bug 19376 - Follow-up on QA 84385 - Bug 19376 - Keep 655 in the general Subject index Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19376 - Adds 655$a to Zebra facets Using index info to reconstruct a base tree... M C4/Koha.pm M C4/Search.pm M etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml M etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl M koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc M koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc Auto-merging etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl Auto-merging etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml Auto-merging C4/Search.pm Auto-merging C4/Koha.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 19376 - Adds 655$a to Zebra facets 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-19376---Adds-655a-to-Zebra-facets-gCwpao.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/
