https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17600 --- Comment #44 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Jonathan Druart from comment #43)
(In reply to Marcel de Rooy from comment #40)
Applying: Bug 17600: Rerun the script to update use statements fatal: sha1 information is lacking or useless (C4/Auth_with_shibboleth.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 17600: Rerun the script to update use statements
Somehow I have the feeling that we are running more frequently against these errors. Something to do with different git versions ? I am using git version 2.1.4 on Jessie. (Should be the default version?)
One patch was not in the correct order.
OK. It does apply now. Trying to have a look tomorrow. -- You are receiving this mail because: You are watching all bug changes.