[Koha-bugs] [Bug 8984] Zebra does not index some fields in UNIMARC biblio records

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8984

Zeno Tajoli <z.tajoli at cineca.it> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #9 from Zeno Tajoli <z.tajoli at cineca.it> ---
Hi Mathieu,

the patch has problem on master.
>From sandboxes:

Something went wrong !

Applying: Bug 8984: make Zebra more UNIMARC compliant
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
CONFLICT (content): Merge conflict in
etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
Auto-merging etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl
Failed to merge in the changes.
Patch failed at 0001 Bug 8984: make Zebra more UNIMARC compliant
When you have resolved this problem run git am --resolved.
If you would prefer to skip this patch, instead run git am --skip.
To restore the original branch and stop patching run git am --abort.
Bug 8984 - Zebra does not index some fields in UNIMARC biblio records

I think you need to rebase it

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