https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25253
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #2 from Séverine Queune <[email protected]> --- Quite an old one, rebase is needed :/ $ git bz apply 25253 Bug 25253 Depends on bug 24679 (Failed QA) Follow? [(y)es, (n)o] y Bug 24679 - Allow to apply a MARC modification template in export tool 111519 - Bug 24679: Allow to apply a MARC modification template in export tool 111520 - Bug 24679: Return the correct id in AddModificationTemplate 111521 - Bug 24679: Fix exporter tests Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 24679: Allow to apply a MARC modification template in export tool Using index info to reconstruct a base tree... M C4/Record.pm M Koha/Exporter/Record.pm M koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt M t/db_dependent/Exporter/Record.t M tools/export.pl Falling back to patching base and 3-way merge... Auto-merging tools/export.pl CONFLICT (content): Merge conflict in tools/export.pl Auto-merging t/db_dependent/Exporter/Record.t Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt Auto-merging Koha/Exporter/Record.pm Auto-merging C4/Record.pm CONFLICT (content): Merge conflict in C4/Record.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 24679: Allow to apply a MARC modification template in export tool 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-24679-Allow-to-apply-a-MARC-modification-templ-6_q4PP.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/
