From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Fri, 29 Oct 2021 14:10:11 -0400 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27723"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Glenn Morris , emacs-devel@gnu.org To: Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Oct 29 20:24:03 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 1mgWXq-0006zB-IO for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 20:24:02 +0200 Original-Received: from localhost ([::1]:41316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgWXp-0008EH-BN for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 14:24:01 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgWKe-0005xb-0G for emacs-devel@gnu.org; Fri, 29 Oct 2021 14:10:29 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:34284) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgWKX-0002zt-7F; Fri, 29 Oct 2021 14:10:21 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 08F12807E8; Fri, 29 Oct 2021 14:10:14 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id AE70A80065; Fri, 29 Oct 2021 14:10:12 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1635531012; bh=CiWeHu9uyAm8RGuhWQ7crU69KxZXAHt/ziq/t+A3y5A=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=o6LE1gkn6J0VQ8RWigLWX/YvzBXT98fXbDhzVQRExjVrthTRuxC5tVTF52twHqKFv Uh4V1XEYsNRsqzG1+jiaLVsUv9xcea8Jx8UklM8uVlRz9YDy2KlShGXfocEA8bbniO wmBem3ctnQcHmeu1RAvvwbJxJ8g1lAdJwZBTdUZSgaqfeRtnw3DGfIA5aCSQBC8ht2 NlIsQ9ToXirQi8Nh/V8Jz5PQJi8QhIJVqtc1buo8i4w7lS+t74VkQF2AIrcLul1sqK gntGly2F6EtrTDR78TCmYgSTxgiKnFGHfta0yPNbd0AvX8VDgZZpBmskoUKil+gDB2 QyfFLWExYzi0Q== Original-Received: from pastel (unknown [45.72.241.23]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 78C4B120169; Fri, 29 Oct 2021 14:10:12 -0400 (EDT) In-Reply-To: (Stefan Kangas's message of "Fri, 29 Oct 2021 10:01:52 -0700") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:278226 Archived-At: > Another idea is that other people could proactively merge, if they > suspect that their changes might cause conflicts. (I haven't done so, > for fear of stepping on your toes, but I would be happy to start.) I think we should get in the habit of merging proactively, indeed. If `emacs-28` was already merged before your commit(s), then it's a small matter of going back to the main branch and doing `git merge emacs-28` or `git merge -s ours emacs-28`. Stefan