From: Francis Moreau <francis.moro@gmail.com>
Date: Thu, 22 Feb 2007 08:22:27 GMT
Subject: git-am failed, what's next ?
Message-ID: <38b2ab8a0702220022wab25519hbb57629934e7f104@mail.gmail.com>

Hi,

I'm a bit clueless when git-am failed to apply a patch. I dunno what I
should do at this point since errors reported by git-am are not
usefull for me. For example I got:

----
error: patch failed: foo:1
error: foo: patch does not apply

Patch failed at 0001.
When you have resolved this problem run "git-am --resolved".
If you would prefer to skip this patch, instead run "git-am --skip".
---

I know that git-am let some information in '.dotest' directory and
that I can find in it the plain patch file. I can use 'patch' command
to apply it and see which part of the patch is conflicting. But I
would like to know if there are other ways to do it specially by using
git ?

BTW, would it be possible to be more verbose when describing the error ?

thanks
-- 
Francis

PS: git rocks !