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: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Date: Mon, 17 Aug 2020 21:16:26 +0300 Message-ID: <83364lgmth.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> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21953"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rpluim@gmail.com, eggert@cs.ucla.edu, emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 17 20:17:24 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 1k7jhC-0005ZQ-Uu for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 20:17:22 +0200 Original-Received: from localhost ([::1]:46676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7jhC-0001kP-0A for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 14:17:22 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7jgY-0001JX-TF for emacs-devel@gnu.org; Mon, 17 Aug 2020 14:16:42 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:33660) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7jgY-0002gv-IQ; Mon, 17 Aug 2020 14:16:42 -0400 Original-Received: from [176.228.60.248] (port=4179 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k7jgX-0001Zl-TA; Mon, 17 Aug 2020 14:16:42 -0400 In-Reply-To: <877dtxp2sx.fsf@gnus.org> (message from Lars Ingebrigtsen on Mon, 17 Aug 2020 20:03:58 +0200) 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:253905 Archived-At: > From: Lars Ingebrigtsen > Cc: eggert@cs.ucla.edu, rpluim@gmail.com, emacs-devel@gnu.org > Date: Mon, 17 Aug 2020 20:03:58 +0200 > > Eli Zaretskii writes: > > > Please don't. It can cause subtle problems in some rare cases. Or at > > least that's how it was in the past. > > If so, it's changed. There's nothing magical much about rebasing: I didn't say it was magical, I said it can cause subtle problems. I forget the details, but rebasing after merging could bring the same commit more than once. Or something like that. Why do you feel the need to rebase? The default merge that pull does is as "non-magical" as rebase. > Seems pretty safe to me. Until it isn't.