Hi Lancer,
As a general thought, it still looks like there's a problem with
the way the patch is getting saved by your email client.
It *might* work, if Arnaud was to email the patch to you as a file,
which your email client shouldn't (in theory) break when it saves.
However, it might just be easier in this case to wait until his
patches are reviewed, then added to the main git repository.
It shouldn't be able to go wrong that way. :)
Regards and best wishes,
Justin Clift
On 11/02/2010 12:32 PM, 黄亮 wrote:
>
> Well, I removed the ">", and yes it goes a few steps further but it
> still fail to apply
> the error msg is :
>
> fatal: sha1 information is lacking or useless (Domain.cs).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
>
> so what can I do?
>
> Regards
>
> 2010-11-02
> Lancer
__________ Information from ESET Smart Security, version of virus signature database 5583 (20101101) __________
The message was checked by ESET Smart Security.
http://www.eset.com