https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13717 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de Status|Needs Signoff |Patch doesn't apply --- Comment #5 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Dependent bug 12598 has reached 'signed off' status now. But this patch no longer applies on top: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 13717 - Add ability to move old patron attributes when importing new patron data fatal: sha1 information is lacking or useless (Koha/Borrower/Import.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 13717 - Add ability to move old patron attributes when importing new patron data 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-13717---Add-ability-to-move-old-patron-attribu-RtYPcs.patch -- You are receiving this mail because: You are watching all bug changes.