https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26351
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #11 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- Patch on longer applies - please rebase! Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 26351: Add plugin hooks to transform item barcodes Using index info to reconstruct a base tree... M C4/Circulation.pm M C4/Items.pm M Koha/Item.pm M cataloguing/additem.pl M circ/circulation.pl M circ/returns.pl M offline_circ/process_koc.pl M opac/sco/sco-main.pl M t/lib/Koha/Plugin/Test.pm M tools/batchMod.pl M tools/inventory.pl Falling back to patching base and 3-way merge... Auto-merging tools/inventory.pl Auto-merging tools/batchMod.pl CONFLICT (content): Merge conflict in tools/batchMod.pl Auto-merging t/lib/Koha/Plugin/Test.pm Auto-merging opac/sco/sco-main.pl Auto-merging offline_circ/process_koc.pl Auto-merging circ/returns.pl Auto-merging circ/circulation.pl Auto-merging cataloguing/additem.pl CONFLICT (content): Merge conflict in cataloguing/additem.pl Auto-merging Koha/Item.pm CONFLICT (content): Merge conflict in Koha/Item.pm Auto-merging C4/Items.pm Auto-merging C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 26351: Add plugin hooks to transform item barcodes 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-26351-Add-plugin-hooks-to-transform-item-barco-ho0gdo.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/