From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "John Wiegley" Newsgroups: gmane.emacs.devel Subject: Re: Rebasing vs. merging Date: Wed, 19 Aug 2020 09:22:24 -0700 Message-ID: References: <20200816182558.16607.52991@vcs0.savannah.gnu.org> <20200816182601.16F2A209AC@vcs0.savannah.gnu.org> <87imdisam3.fsf@gnus.org> <83k0xxgt81.fsf@gnu.org> <0c69fb1c-330c-efcf-6005-95117bba9057@cs.ucla.edu> <87lfidp7bd.fsf@gnus.org> <837dtxgpyz.fsf@gnu.org> <877dtxp2sx.fsf@gnus.org> <83364lgmth.fsf@gnu.org> <87364lp0zt.fsf@gnus.org> <87y2mbxal7.fsf@iki.fi> <838seaelk9.fsf@gnu.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="33387"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.50 (darwin) Cc: larsi@gnus.org, emacs-devel@gnu.org, rpluim@gmail.com, eggert@cs.ucla.edu To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Aug 19 18:23:07 2020 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 1k8Qri-0008Z5-Fj for ged-emacs-devel@m.gmane-mx.org; Wed, 19 Aug 2020 18:23:06 +0200 Original-Received: from localhost ([::1]:36530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8Qrh-0008DY-J6 for ged-emacs-devel@m.gmane-mx.org; Wed, 19 Aug 2020 12:23:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8QrD-0007ms-Bi for emacs-devel@gnu.org; Wed, 19 Aug 2020 12:22:35 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:51397) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8QrA-0008MW-T3; Wed, 19 Aug 2020 12:22:32 -0400 Original-Received: from auth2-smtp.messagingengine.com ([66.111.4.228]:36381) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.82) (envelope-from ) id 1k8QrA-0001Qq-5V; Wed, 19 Aug 2020 12:22:32 -0400 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailauth.nyi.internal (Postfix) with ESMTP id A6DF827C005C; Wed, 19 Aug 2020 12:22:31 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 19 Aug 2020 12:22:31 -0400 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedruddtkedgjeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfffkfhgfgggtsehttdertddtredtnecuhfhrohhmpedflfhohhhn ucghihgvghhlvgihfdcuoehjohhhnhifsehgnhhurdhorhhgqeenucggtffrrghtthgvrh hnpeffudefhfevtddtheeivdekjeelhefgvdeitefggeelvdehteegfeegledvgfdtkeen ucffohhmrghinhepnhgvfigrrhhtihhsrghnshdrtghomhenucfkphepjeeirddvfeegrd eiledrudegleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehjohhhnhifodhmvghsmhhtphgruhhthhhpvghrshhonhgrlhhithihqdeikeejke dtleeggedqudejjeehfeekudeiqdhjohhhnhifpeepghhnuhdrohhrghesnhgvfigrrhht ihhsrghnshdrtghomh X-ME-Proxy: Original-Received: from localhost (76-234-69-149.lightspeed.frokca.sbcglobal.net [76.234.69.149]) by mail.messagingengine.com (Postfix) with ESMTPA id DB24C3280060; Wed, 19 Aug 2020 12:22:30 -0400 (EDT) In-Reply-To: <838seaelk9.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 19 Aug 2020 17:51:02 +0300") Mail-Followup-To: Eli Zaretskii , Teemu Likonen , larsi@gnus.org, eggert@cs.ucla.edu, rpluim@gmail.com, emacs-devel@gnu.org 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:254022 Archived-At: >>>>> "EZ" == Eli Zaretskii writes: EZ> Please note that I didn't want to start any "philosophical" arguments wrt EZ> Git, nor have another "merge vs rebase" argument, of which we had enough EZ> in the past, I think. All I wanted to say was that we have discussed this EZ> in the past, and decided to use a merge-based workflow (bugfixes are EZ> pushed to the stable branch and then merged to master), and to stop caring EZ> about the merge-commits created by Git when there's a "push race". Thanks Eli, I think this is a reasonable pattern to continue with. -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2