https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15261
Alex Buckley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #44 from Alex Buckley <[email protected]> --- When applying these patches this error is thrown: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15261: Verify if checkouts/reserves requests periods overlap... Applying: Bug 15261 - Check reserves while renewing an issue fatal: sha1 information is lacking or useless (C4/Circulation.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 15261 - Check reserves while renewing an issue 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-15261---Check-reserves-while-renewing-an-issue-b3aCiG.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
