From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: master 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Thu, 13 May 2021 00:53:40 -0400 Message-ID: References: <20210512030946.27770.7288@vcs0.savannah.gnu.org> <20210512030949.65CD421128@vcs0.savannah.gnu.org> <874kf89xjy.fsf@gmail.com> <835yzo3ykt.fsf@gnu.org> Reply-To: rms@gnu.org Content-Type: text/plain; charset=Utf-8 Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13251"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rpluim@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu May 13 06:54:40 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 1lh3Mu-0003LA-Ck for ged-emacs-devel@m.gmane-mx.org; Thu, 13 May 2021 06:54:40 +0200 Original-Received: from localhost ([::1]:34968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lh3Mt-0006DJ-Ca for ged-emacs-devel@m.gmane-mx.org; Thu, 13 May 2021 00:54:39 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lh3Lx-0005Cj-Ni for emacs-devel@gnu.org; Thu, 13 May 2021 00:53:41 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:57806) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lh3Lx-00037W-F8; Thu, 13 May 2021 00:53:41 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1lh3Lw-0004gy-OP; Thu, 13 May 2021 00:53:40 -0400 In-Reply-To: <835yzo3ykt.fsf@gnu.org> (message from Eli Zaretskii on Wed, 12 May 2021 15:50:58 +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:269229 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > Richard> Author: Richard Stallman > > Richard> Commit: Richard Stallman > > > > Richard> Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs > > > > Richard> What choice do I have? > Richard, can you tell what caused you to ask that question? I did git pull and it said there were conflicts. I resolved the conflicts and committed them. Then I did git pull again and it asked me why I was doing the merge. I could not think of any reason except that git demanded it. I have never tried rebasing. I have been taught that you can easily die of an overdose that way. Oh, sorry, that was "freebasing". -- Dr Richard Stallman (https://stallman.org) Chief GNUisance of the GNU Project (https://gnu.org) Founder, Free Software Foundation (https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)