Date: Mon, 29 Sep 2025 07:59:42 +0300 From: Andriy Gapon <avg@FreeBSD.org> To: Zhenlei Huang <zlei@FreeBSD.org>, Justin Hibbits <chmeee@has.gonegalt.net> Cc: Michael Tuexen <tuexen@FreeBSD.org>, "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-branches@freebsd.org" <dev-commits-src-branches@FreeBSD.org>, Warner Losh <imp@bsdimp.com> Subject: Re: git: b4c6c3db0379 - stable/14 - ipfw: Teach ipfw that EtherIP is an upper layer protocol Message-ID: <08b7ae7f-8799-4cb5-b5f7-de4cb9c828e8@FreeBSD.org> In-Reply-To: <BB56F074-F352-48CB-BE97-0BA280B5A232@FreeBSD.org> References: <202509271513.58RFDst3083057@gitrepo.freebsd.org> <44DAB9B2-B037-49B0-9153-90B4CFBB6234@FreeBSD.org> <20250927143548.661e75f7@ralga.knownspace> <BB56F074-F352-48CB-BE97-0BA280B5A232@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?08b7ae7f-8799-4cb5-b5f7-de4cb9c828e8>