Re: git-am doesn't apply the rest of the email after a partial patch fail?

From: Constantine A. Murenin <mureninc@gmail.com>
Date: Apr 9, 2013, 18:34 UTC
Message-ID: <CAPKkNb6tbGtcpiYGpj6mSPnp_-aXO=HTvAjOEKJ1f-cgPOHBDA@mail.gmail.com>
In-Reply-To: <7vppy4ykse.fsf@alter.siamese.dyndns.org>

On 8 April 2013 10:49, Junio C Hamano <gitster@pobox.com> wrote:

Show 16 quoted lines

> "Constantine A. Murenin" <mureninc@gmail.com> writes:
>
>> However, what I've faced with, is that when a conflict happens, and I
>> resolve, and do `git add`, and `git am --resolved`, then the rest of
>> the `format-patch` email where the conflict has occurred is discarded,
>
> That is unusual.  Are you using any other options when running "git
> am"?  You said `git add`, but what did you add?
>
> By default, its patch application is all-or-none, so when it stops,
> saying "I cannot apply this patch---please help me with it", it
> expects that all the changes the email wanted to give you has been
> applied by you to your working tree, perhaps using GNU patch or "git
> apply --reject", followed by manual editing, and to your index using
> "git add", when you run "git am --resolved".  Not just the file (or
> hunk) it detected issues with.

Well, I now know this, but it wasn't clear from the documentation that that was the behaviour.

Also, I've now noticed that "--reject" doesn't automatically do `git add` of any new files that were added, so, once you resolve the conflicts, and add those files that used to result in a conflict, you're still missing out.

C.