[Koha-bugs] [Bug 7180] Order from staged file improvements

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180

--- Comment #4 from mathieu saby <mathieu.saby at univ-rennes2.fr> ---
Hello Jonathan.
I got a new error : 

fatal: sha1 information is lacking or useless
(installer/data/mysql/updatedatabase.pl).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 7180: Order from staged file improvements
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


M. Saby

-- 
You are receiving this mail because:
You are watching all bug changes.