http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7844 Magnus Enger <magnus@enger.priv.no> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #26 from Magnus Enger <magnus@enger.priv.no> --- Sorry Dobrica, with the second patch I get: $ git bz apply 7844 Bug 7844 - plack scripts for developers 26148 - Bug 7844 - [SIGNED-OFF] plack intranet tooling for developers 26201 - Bug 7844 - plack should redirect / to correct page Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 7844 - [SIGNED-OFF] plack intranet tooling for developers Applying: Bug 7844 - plack should redirect / to correct page fatal: sha1 information is lacking or useless (misc/plack/koha.psgi). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 7844 - plack should redirect / to correct page 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-7844---plack-should-redirect--to-correct-page-U01YNR.patch -- You are receiving this mail because: You are watching all bug changes.