Re: git: b4c6c3db0379 - stable/14 - ipfw: Teach ipfw that EtherIP is an upper layer protocol

[Zhenlei Huang]

> On Sep 29, 2025, at 12:59 PM, Andriy Gapon <a...@freebsd.org> wrote:
> 
> On 29/09/2025 06:22, Zhenlei Huang wrote:
>> I have ever encountered merge conflicts when doing MFC and it is painful to 
>> resolve the conflicts multiple times when MFCing to older branches.
> 
> I always enable Git rerere and (almost) never regret it.

Nice git command !

> 
> -- 
> Andriy Gapon

Best regards,
Zhenlei