https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14385
--- Comment #176 from Katrin Fischer <[email protected]> --- (In reply to Marcel de Rooy from comment #175) > (In reply to Katrin Fischer from comment #173) > > Please rebase. > > > > Apply? [(y)es, (n)o, (i)nteractive] y > > Applying: Bug 14385: Extend OpacHiddenItems to allow specifying exempt > > borrower categories > > Applying: Bug 14385 Followup: C4::Borrowers not found > > Applying: Bug 14385: Followup: changes to sysprefs.sql and atomicupdate > > Applying: Bug 14385: Squash of a lot of patches rebased > > fatal: sha1 information is lacking or useless (C4/Search.pm). > > Repository lacks necessary blobs to fall back on 3-way merge. > > Cannot fall back to three-way merge. > > Patch failed at 0001 Bug 14385: Squash of a lot of patches rebased > > 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-14385-Squash-of-a-lot-of-patches-rebased-PmRtSL.patch > > cait: Are you working on this one ? Haven't started yet to look beyong applying, happy to hand over! -- 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/
