Re: git: b4c6c3db0379 - stable/14 - ipfw: Teach ipfw that EtherIP is an upper layer protocol
- Reply: Zhenlei Huang : "Re: git: b4c6c3db0379 - stable/14 - ipfw: Teach ipfw that EtherIP is an upper layer protocol"
- In reply to: Zhenlei Huang : "Re: git: b4c6c3db0379 - stable/14 - ipfw: Teach ipfw that EtherIP is an upper layer protocol"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 29 Sep 2025 04:59:42 UTC
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. -- Andriy Gapon