From: Miklos Vajna <vmiklos@collabora.com>
Date: Tue, 23 Jun 2026 11:30:33 GMT
Subject: Re: [PATCH v4] log: improve --follow following renames for non-linear history
Message-ID: <ajpuWSUiQ6CRV2Kv@collabora.com>
In-Reply-To: <xmqq1pdy4udg.fsf@gitster.g>

Hi Junio,

On Mon, Jun 22, 2026 at 05:44:43AM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> went on in this patch would count), but as long as the resolution
> that is in my tree (as a part of 'seen') exactly matches what your
> update contains (meaning: rerere will do the same correct resolution
> when the topic gets merged to 'master' anyway) and the conflict is
> trivial to resolve by hand for others

I see, I'll keep that in mind for the future.

Thanks,

Miklos