http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11708
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #65 from Katrin Fischer <[email protected]> --- I am sorry Julian, I am having trouble with this... AGAIN. Patch 3 had a conflict, that I thought I fixed pretty well, but now patch 5 gives me trouble: Applying: Bug 11708: All basketgroups on one page - several fixes fatal: sha1 information is lacking or useless (installer/data/mysql/updatedatabase.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 11708: All basketgroups on one page - several fixes The copy of the patch that failed is found in: /home/katrin/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-11708-All-basketgroups-on-one-page---several-f-dTc5Ih.patch I am sorry :( -- 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/
