Re: Why `git am -3` apply patches that don't normally apply?

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 5, 2022, 18:09 UTC
Message-ID: <xmqqmtdnjut5.fsf@gitster.g>
In-Reply-To: <CABPp-BEkEKQZR=1duxSS4AVv9u5tnPk5CaLCM_fQWPbAqfSMxw@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 6 quoted lines

> As per the documentation of -3:
>
>         When the patch does not apply cleanly, fall back on
>         3-way merge if the patch records the identity of blobs
>         it is supposed to apply to and we have those blobs
>         available locally.

I suspect that we would need to update this part, as the order of "fall back" was swapped sometime in the recent past (and we have fixed a few bugs that were introduced as fallouts).

Your description on how -3 works when it does the three-way based on the concrete example was very clear and easy to understand, by the way.

Thanks for writing it up.