From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Sat, 30 Oct 2021 19:33:52 +0300 Message-ID: <83lf2ao4jz.fsf@gnu.org> References: <87bl37vg9l.fsf@gnus.org> <87y26bu0ih.fsf@gnus.org> <83pmrnppqy.fsf@gnu.org> <874k8yspb4.fsf@gnus.org> <835ytepvad.fsf@gnu.org> <51ab9b37-7c1b-0b71-4875-265ac402a756@yandex.ru> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5862"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rgm@gnu.org, larsi@gnus.org, stefan@marxist.se, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Oct 30 18:35:12 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mgrK4-0001Jc-35 for ged-emacs-devel@m.gmane-mx.org; Sat, 30 Oct 2021 18:35:12 +0200 Original-Received: from localhost ([::1]:50340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgrK2-0002fo-6b for ged-emacs-devel@m.gmane-mx.org; Sat, 30 Oct 2021 12:35:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgrJ1-0001zT-8I for emacs-devel@gnu.org; Sat, 30 Oct 2021 12:34:07 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:57898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgrIz-0007io-PZ; Sat, 30 Oct 2021 12:34:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=tVlmYYy0ikZnyGqPJ8JKnHkWSMPmWRvaBVsnuYs9Oyc=; b=GdwBzCIGW6aF znrUjp9POqBNTvGeIzY5POvEBMcXObfFUe7Z0ucvpnSbF/RoHgClGhR18Iw7yceIFWtnFoXf1318I Zr1wzhIGPzONK8wx6fwahm8ziCmyIvf5NHL3ryujCELOKFk49pMFrRDEKSYKKMas7cGLhyv8suj/4 H12WGRuIyJxBgjowis8xbm1tE2gbnQP/xKZiYRdgXxMPA+W4EAuaD/RpgvAPI2AtBDa5loMnKL2JO /78m0U2gmC4g8sX/0dtl2XFJH0yGG5zWzxT7uwaiUK09C2yH+qTcEZZcmTpxbaXjiwTYZtRPNpD6b fswAinxwRV9YoYXsVhFMaw==; Original-Received: from [87.69.77.57] (port=3471 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgrIy-0003r2-Nk; Sat, 30 Oct 2021 12:34:05 -0400 In-Reply-To: <51ab9b37-7c1b-0b71-4875-265ac402a756@yandex.ru> (message from Dmitry Gutov on Sat, 30 Oct 2021 15:30:30 +0300) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:278286 Archived-At: > From: Dmitry Gutov > Date: Sat, 30 Oct 2021 15:30:30 +0300 > Cc: rgm@gnu.org, stefan@marxist.se, monnier@iro.umontreal.ca, > emacs-devel@gnu.org > > > And of course, cherry-picking doesn't remove merge conflicts, they > > will still need to be resolved. > > By the author of the change, that's the point. Btw, if this is what will make the situation better, we could merge ti master immediately after pushing to the release branch, by the same committer.