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 15:00:39 -0400 Message-ID: References: <87bl37vg9l.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5894"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Stefan Kangas , Glenn Morris , emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Oct 29 21:07:46 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 1mgXEA-0001H7-4B for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 21:07:46 +0200 Original-Received: from localhost ([::1]:41218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgXE8-0007Yn-H3 for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 15:07:44 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgX7R-0003n8-5d for emacs-devel@gnu.org; Fri, 29 Oct 2021 15:00:51 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:7567) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgX7M-0001FL-Lb; Fri, 29 Oct 2021 15:00:46 -0400 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 6F810441526; Fri, 29 Oct 2021 15:00:42 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 21F764414E8; Fri, 29 Oct 2021 15:00:41 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1635534041; bh=lEXf/qVy0iB5ykgI8baa6Pxq89B+1yzm7EENN65R3Nw=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=UdW9iy4rC08WW1QyASxQUV23VGi2cWvXzWqo4Zp6gmM2HFXQG+0rBJazpKq9M5wz2 JWEvgCzyGAXWw5uUC9PF53FYIvUfZUvGKo8uNTOaYV7/znoFEahQWb6+cjseGF3XDg Vc7RQ1DRnxsD8oqTETsAuoeHqNu4DtRYIQqOrO8vnf2u2QJbo1joBoClPTMM2xwx9C WxVNVpQnTstLszTA3hmiUsWWjKqyoi9GE6x0O737euiJqfFTYL8Bn04T1KzvUdlCV5 O/KEjwQV+INdjXrJekX29hfvs8UrEgazb+W812C3qXiqcJzcMzLF+hW/mxM40TiyL4 CfBM2DFmzi25w== Original-Received: from ceviche (unknown [45.72.241.23]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id D3939120866; Fri, 29 Oct 2021 15:00:40 -0400 (EDT) In-Reply-To: <87bl37vg9l.fsf@gnus.org> (Lars Ingebrigtsen's message of "Fri, 29 Oct 2021 20:26:46 +0200") 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:278232 Archived-At: Lars Ingebrigtsen [2021-10-29 20:26:46] wrote: > Stefan Monnier writes: >> 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`. > That work flow sounds fine to me in general -- but what about those > changes to emacs-28 that shouldn't be merged? That's what `git merge -s ours emacs-28` does (it marks the commit as merged but without bringing any of the corresponding code changes). Stefan