From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Merge conflicts
Date: Mon, 04 Oct 2021 11:22:13 -0400
Message-ID: <4lr1d0rf16.fsf@fencepost.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="10562"; mail-complaints-to="usenet@ciao.gmane.io"
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
To: emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Oct 04 17:23:16 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 1mXPoC-0002cB-Dm
	for ged-emacs-devel@m.gmane-mx.org; Mon, 04 Oct 2021 17:23:16 +0200
Original-Received: from localhost ([::1]:58280 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 1mXPoB-0001M8-CW
	for ged-emacs-devel@m.gmane-mx.org; Mon, 04 Oct 2021 11:23:15 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38410)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <rgm@gnu.org>) id 1mXPnO-00007W-7m
 for emacs-devel@gnu.org; Mon, 04 Oct 2021 11:22:27 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:57766)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <rgm@gnu.org>) id 1mXPnM-0000HX-Gp
 for emacs-devel@gnu.org; Mon, 04 Oct 2021 11:22:25 -0400
Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.90_1)
 (envelope-from <rgm@gnu.org>)
 id 1mXPnH-0007Br-4I; Mon, 04 Oct 2021 11:22:22 -0400
X-Spook: pre-emptive ARC Reyosa Uzi Immigration Customs
X-Ran: ]mjF$Xq&sjY,.;OBEhcHepG]~n1f>D(Ixh]9bJCz-^d=-J[J=1%*Kzhx>X#yCiS6IUaU|I
X-Hue: blue
X-Attribution: GM
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:276212
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/276212>


The emacs-28 branch is already accruing merge conflicts against master,
which is a bit depressing. Please think about these things if you are
changing the same file on both branches. Eg remember to write
"do not merge to master" in the log when appropriate (ef6c43b896?).
Thanks!