https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15235
Harold <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #5 from Harold <[email protected]> --- Hi Julian, During Koha Conference 2017 Hackfest, we tried to test your patch on a sandbox but we got this message: Some problems occurred applying patches from bug 15235: <h1>Something went wrong !</h1>Applying: Bug 15235: Add column filters to checkouts table fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 15235: Add column filters to checkouts table The copy of the patch that failed is found in: /home/sandbox1/src/.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. Bug 15235 - Add column filters to checkouts table 61160 - Bug 15235: Add column filters to checkouts table Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-15235-Add-column-filters-to-checkouts-table-FaU1cI.patch. Thanks. -- 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/
