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 bdda935 2/2: Merge branch 'master' of
 git.savannah.gnu.org:/srv/git/emacs
Date: Mon, 17 Aug 2020 18:58:06 +0300
Message-ID: <83k0xxgt81.fsf@gnu.org>
References: <20200816182558.16607.52991@vcs0.savannah.gnu.org>
 <20200816182601.16F2A209AC@vcs0.savannah.gnu.org>
 <87imdisam3.fsf@gnus.org> <m2zh6t2wa8.fsf@gmail.com>
Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214";
	logging-data="23985"; mail-complaints-to="usenet@ciao.gmane.io"
Cc: larsi@gnus.org, emacs-devel@gnu.org
To: Robert Pluim <rpluim@gmail.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 17 17:59:17 2020
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 1k7hXW-00061k-Sk
	for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 17:59:14 +0200
Original-Received: from localhost ([::1]:52676 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 1k7hXV-0003Cs-Sk
	for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 11:59:13 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34626)
 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 1k7hWj-0001GV-Cd
 for emacs-devel@gnu.org; Mon, 17 Aug 2020 11:58:25 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:59021)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <eliz@gnu.org>)
 id 1k7hWj-0001ep-2E; Mon, 17 Aug 2020 11:58:25 -0400
Original-Received: from [176.228.60.248] (port=3680 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
 (Exim 4.82) (envelope-from <eliz@gnu.org>)
 id 1k7hWe-0000gr-Ao; Mon, 17 Aug 2020 11:58:21 -0400
In-Reply-To: <m2zh6t2wa8.fsf@gmail.com> (message from Robert Pluim on Mon, 17
 Aug 2020 16:15:43 +0200)
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:253890
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/253890>

> From: Robert Pluim <rpluim@gmail.com>
> Date: Mon, 17 Aug 2020 16:15:43 +0200
> Cc: emacs-devel@gnu.org
> 
> You forgot to add '--rebase' to your 'git pull'.

No, please try to avoid using "pull --rebase".  It can have bad
consequences in some corner cases.  Just "pull" is TRT, as it will
perform a merge, and the result is perfectly okay for Emacs, as we
decided long ago.