https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19278
Alex Buckley <alexbuck...@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |alexbuck...@catalyst.net.nz Status|Needs Signoff |Patch doesn't apply --- Comment #5 from Alex Buckley <alexbuck...@catalyst.net.nz> --- Hi Tomas Sorry but when applying your patch I got the following merge error, (note: I did apply patch 19196 beforehand): Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19278: Add RESTdefaultPageSize syspref Applying: Bug 19278: Unit tests Using index info to reconstruct a base tree... M t/Koha/REST/Plugin/Pagination.t Falling back to patching base and 3-way merge... Auto-merging t/Koha/REST/Plugin/Pagination.t Applying: Bug 19278: Make the pagination plugin use RESTdefaultPageSize fatal: sha1 information is lacking or useless (Koha/REST/Plugin/Pagination.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 19278: Make the pagination plugin use RESTdefaultPageSize 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-19278-Make-the-pagination-plugin-use-RESTdefau-NPNcVH.patch -- 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/