From: Francis Moreau <francis.moro@gmail.com>
Date: Thu, 22 Feb 2007 10:50:02 GMT
Subject: Re: git-am failed, what's next ?
Message-ID: <38b2ab8a0702220250v2c2ca77fub95b1e9a2a57bd78@mail.gmail.com>
In-Reply-To: <7v8xeqh6bj.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:
> 	$ git am -3
>
> This can result in one of three things:
>
>  * It can complain, with "Patch does not record usable index
>    information".  When this happens, you are back to square-one.
>    Your repository does not have enough blobs for it to fall
>    back on 3-way merge.  The operation did not change anything
>    in your working tree nor what are in .dotest/ directory, so
>    it did not do any further harm.  You have to use one of the
>    two strategies described above instead.
>

BTW, in this case I got the following error message:

fatal: sha1 information is lacking or useless (foo).
Patch does not record usable index information.
Cannot fall back to three-way merge.
Patch failed at 0001.

which is hard to understand, whereas your explanation:

Your repository does not have enough blobs for it to fall
back on 3-way merge.

sounds better and easier to understand to me...
-- 
Francis