From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Rebasing vs merging (was: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs) Date: Mon, 17 Aug 2020 20:45:56 +0200 Message-ID: <87mu2trtzv.fsf_-_@telefonica.net> 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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2697"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.91 (gnu/linux) To: emacs-devel@gnu.org Cancel-Lock: sha1:zNy0YWQiskRGdAM3QP1afSweaaM= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 17 20:46:53 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 1k7k9j-0000Y5-E8 for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 20:46:51 +0200 Original-Received: from localhost ([::1]:42134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7k9i-0005Fi-HH for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 14:46:50 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7k92-0004nQ-VY for emacs-devel@gnu.org; Mon, 17 Aug 2020 14:46:08 -0400 Original-Received: from static.214.254.202.116.clients.your-server.de ([116.202.254.214]:42190 helo=ciao.gmane.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7k90-0006CC-Hf for emacs-devel@gnu.org; Mon, 17 Aug 2020 14:46:07 -0400 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1k7k8w-000AG6-Bu for emacs-devel@gnu.org; Mon, 17 Aug 2020 20:46:02 +0200 X-Injected-Via-Gmane: http://gmane.org/ Received-SPF: pass client-ip=116.202.254.214; envelope-from=ged-emacs-devel@m.gmane-mx.org; helo=ciao.gmane.io X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/17 10:21:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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:253908 Archived-At: Eli Zaretskii writes: >> 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. Rebasing keeps your local changes well localized: on top of upstream commits instead of mixed with the rest of the history. Plus, once you send your changes upstream, the result is a linear history or a merge point consisting of your changes on a side and the rest on the other side, instead of a maze of changes. Plus+, it is far easier to self-review and correct your local changes before you send them upstream, so if your hipotetical "double commit" appears (I have never seen that, but whatever) it would be immediately obvious. >> Seems pretty safe to me. > > Until it isn't. Many projects (including Git itself) use rebase as a routine. OTOH, for the reasons mentioned above, I'll say that unwarranted merges are what cause problems.