Date: Sat, 6 Apr 2024 10:53:44 +0300 From: Gleb Popov <arrowd@freebsd.org> To: Joseph Mingrone <jrm@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Subject: Re: git: 082542e6c694 - 2024Q1 - */*: Chase editors/emacs update Message-ID: <CALH631k-Aua1exncjGNS9-%2B=4T7bYcL48MzWEt5dADWExhde5A@mail.gmail.com> In-Reply-To: <86jzlbmdae.fsf@phe.ftfl.ca> References: <202403262357.42QNvEQP032101@gitrepo.freebsd.org> <CAJE75NHaqRksVkwzRKm2c=WnKNcZUMjDMrhJetHKRaF2EYjDTA@mail.gmail.com> <86jzlbmdae.fsf@phe.ftfl.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Apr 6, 2024 at 5:32=E2=80=AFAM Joseph Mingrone <jrm@freebsd.org> wr= ote: > > My apologies if I messed up the resolution of some of the many merge > conflicts. I'll take a closer look this weekend, but since we're now in > Q2, from a user perspective, isn't this now moot? We should not leave the Q1 branch in an inconsistent state anyways.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CALH631k-Aua1exncjGNS9-%2B=4T7bYcL48MzWEt5dADWExhde5A>