25 Feb
2016
25 Feb
'16
3:52 a.m.
On Thu, 2016-02-25 at 09:22 +0100, Michal Privoznik wrote:
I'm having some difficulties applying this:
Applying: build: work around gcc 6.0 warnings Using index info to reconstruct a base tree... error: patch failed: src/fdstream.c:1 error: src/fdstream.c: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001 build: work around gcc 6.0 warnings
Could it be that my git is 'only' 2.4.10 while yours is 2.5.0?
That's probably not it, I have 2.5.0 and I get the same error when trying to apply it with 'git am'. Cheers. -- Andrea Bolognani Software Engineer - Virtualization Team