From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
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 09:38:27 +0300
Message-ID: <83v97n16l8.fsf@gnu.org>
References: <20210512030946.27770.7288@vcs0.savannah.gnu.org>
 <20210512030949.65CD421128@vcs0.savannah.gnu.org> <874kf89xjy.fsf@gmail.com>
 <835yzo3ykt.fsf@gnu.org> <E1lh3Lw-0004gy-OP@fencepost.gnu.org>
Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214";
	logging-data="28036"; mail-complaints-to="usenet@ciao.gmane.io"
Cc: rpluim@gmail.com, emacs-devel@gnu.org
To: rms@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu May 13 08:40:37 2021
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1lh51R-0007Cp-L1
	for ged-emacs-devel@m.gmane-mx.org; Thu, 13 May 2021 08:40:37 +0200
Original-Received: from localhost ([::1]:54596 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1lh51Q-0002mf-Ma
	for ged-emacs-devel@m.gmane-mx.org; Thu, 13 May 2021 02:40:36 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42000)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>) id 1lh4zI-0001XG-G1
 for emacs-devel@gnu.org; Thu, 13 May 2021 02:38:24 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:32984)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <eliz@gnu.org>)
 id 1lh4zI-0003bt-4d; Thu, 13 May 2021 02:38:24 -0400
Original-Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:1527
 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>)
 id 1lh4zB-0005ax-BC; Thu, 13 May 2021 02:38:17 -0400
In-Reply-To: <E1lh3Lw-0004gy-OP@fencepost.gnu.org> (message from Richard
 Stallman on Thu, 13 May 2021 00:53:40 -0400)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org
Original-Sender: "Emacs-devel"
 <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
Xref: news.gmane.io gmane.emacs.devel:269232
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/269232>

> From: Richard Stallman <rms@gnu.org>
> Cc: rpluim@gmail.com, emacs-devel@gnu.org
> Date: Thu, 13 May 2021 00:53:40 -0400
> 
>   > >     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 see nothing wrong with what you did, it's one way of dealing with
local changes when you update from upstream.

> I have never tried rebasing.

I see no reason to start now.