https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14560 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #12 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I am very sorry Julian, it seems the code in AuthoritiesMarc.pm has moved quite a lot since the last rebase. The conflict doesn't look easy to resolve (to me at least). Just a note to help with testing in the future: It's possible to merge authorities in the GUI. Search your authorities, then from the action menu choose 'merge'. When you do that for the second record it will trigger the merge process. Bug 14560 - Introduce a way of handling Rameau composed authorities, without breaking normal workflow 58871 - Bug 14560: Rameau authorities 58872 - Bug 14560 [Follow-up]: Compatible with DOM indexing. 58873 - Bug 14560 [Follow-up]: QA: Add debug warnings and get biblionumber with GetMarcFromKohaField Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 14560: Rameau authorities Using index info to reconstruct a base tree... M C4/AuthoritiesMarc.pm M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref Auto-merging C4/AuthoritiesMarc.pm CONFLICT (content): Merge conflict in C4/AuthoritiesMarc.pm Failed to merge in the changes. Patch failed at 0001 Bug 14560: Rameau authorities The copy of the patch that failed is found in: /home/vagrant/kohaclone/.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-14560-Rameau-authorities-pIduys.patch -- You are receiving this mail because: You are watching all bug changes.