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: Rebasing vs. merging Date: Wed, 19 Aug 2020 17:51:02 +0300 Message-ID: <838seaelk9.fsf@gnu.org> 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> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16131"; mail-complaints-to="usenet@ciao.gmane.io" Cc: larsi@gnus.org, eggert@cs.ucla.edu, rpluim@gmail.com, emacs-devel@gnu.org To: Teemu Likonen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Aug 19 16:51:51 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 1k8PRO-00041q-OJ for ged-emacs-devel@m.gmane-mx.org; Wed, 19 Aug 2020 16:51:50 +0200 Original-Received: from localhost ([::1]:58258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8PRN-0008CZ-Qi for ged-emacs-devel@m.gmane-mx.org; Wed, 19 Aug 2020 10:51:49 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8PQo-0007m6-3G for emacs-devel@gnu.org; Wed, 19 Aug 2020 10:51:14 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:49544) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8PQn-00047L-EJ; Wed, 19 Aug 2020 10:51:13 -0400 Original-Received: from [176.228.60.248] (port=1963 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k8PQm-0008LF-MQ; Wed, 19 Aug 2020 10:51:13 -0400 In-Reply-To: <87y2mbxal7.fsf@iki.fi> (message from Teemu Likonen on Wed, 19 Aug 2020 12:13:08 +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:254015 Archived-At: > From: Teemu Likonen > Cc: rpluim@gmail.com, eggert@cs.ucla.edu, emacs-devel@gnu.org > Date: Wed, 19 Aug 2020 12:13:08 +0300 > > * 2020-08-17 20:43:02+02, Lars Ingebrigtsen wrote: > > > There's "philosophical" issues with rebasing (in that you're > > pretending that your own changes are newer than the remote ones), but > > that's not something we care about. > > Another "philosophical" issue with rebasing is that the resulting code > is not necessarily tested anymore. Please note that I didn't want to start any "philosophical" arguments wrt Git, nor have another "merge vs rebase" argument, of which we had enough in the past, I think. All I wanted to say was that we have discussed this in the past, and decided to use a merge-based workflow (bugfixes are pushed to the stable branch and then merged to master), and to stop caring about the merge-commits created by Git when there's a "push race". At some point we considered to advise "pull --rebase" or its variants, but a discussion in Dec 2014 revealed that mixing rebasing with merge-based workflow can be dangerous, especially if one does local merges from public branches. If you have time and motivation, please read the thread starting at https://lists.gnu.org/archive/html/emacs-devel/2014-12/msg01444.html If someone wants to discuss this specific issue, feel free. But let's not have another "merge vs rebase" dispute. Thanks.