http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11699
M. Tompsett <mtomp...@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |mtomp...@hotmail.com --- Comment #5 from M. Tompsett <mtomp...@hotmail.com> --- I tried to apply it but got: mtompset@ubuntu:~/kohaclone$ git bz apply 11699 Bug 11699 - notes entered when receiving are not saved 25835 - Bug 11699: Notes entered when receiving are not saved 25836 - Bug 11699: ModReceiveOrder should take a hashref in parameter Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 11699: Notes entered when receiving are not saved fatal: sha1 information is lacking or useless (C4/Acquisition.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 11699: Notes entered when receiving are not saved 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-11699-Notes-entered-when-receiving-are-not-sav-IBUgWg.patch Please rebase. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/