From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!.POSTED!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: merge conflict tedium
Date: Thu, 10 Jan 2019 20:06:00 -0500
Message-ID: <8n5zuw57gn.fsf@fencepost.gnu.org>
References: <lly37w9r19.fsf@fencepost.gnu.org> <87ftu4gp4z.fsf@gmx.de>
	<87bm4sgom4.fsf@gmx.de>
NNTP-Posting-Host: blaine.gmane.org
Mime-Version: 1.0
Content-Type: text/plain
X-Trace: blaine.gmane.org 1547168806 30105 195.159.176.226 (11 Jan 2019 01:06:46 GMT)
X-Complaints-To: usenet@blaine.gmane.org
NNTP-Posting-Date: Fri, 11 Jan 2019 01:06:46 +0000 (UTC)
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
Cc: emacs-devel@gnu.org
To: Michael Albinus <michael.albinus@gmx.de>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 11 02:06:42 2019
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([209.51.188.17])
	by blaine.gmane.org with esmtp (Exim 4.84_2)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1ghlHW-0007jt-8O
	for ged-emacs-devel@m.gmane.org; Fri, 11 Jan 2019 02:06:42 +0100
Original-Received: from localhost ([127.0.0.1]:44813 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1ghlJd-0008Nd-3H
	for ged-emacs-devel@m.gmane.org; Thu, 10 Jan 2019 20:08:53 -0500
Original-Received: from eggs.gnu.org ([209.51.188.92]:35077)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1ghlJU-0008Gp-8D
	for emacs-devel@gnu.org; Thu, 10 Jan 2019 20:08:46 -0500
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:51127)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1ghlGq-0005FU-Oi; Thu, 10 Jan 2019 20:06:00 -0500
Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82)
	(envelope-from <rgm@gnu.org>)
	id 1ghlGq-0001bE-Ky; Thu, 10 Jan 2019 20:06:00 -0500
X-Spook: cryptanalysis explosive TELINT Rubin Michoacna Car bomb
X-Ran: fk(aX(ESu/2.p\ylKXzomM}n`6;n^H:oRF(Nc6O9ZHm7$*xCOFl0o.4iN_,94x'*0"bDF/
X-Hue: yellow
X-Attribution: GM
In-Reply-To: <87bm4sgom4.fsf@gmx.de> (Michael Albinus's message of "Mon, 07
	Jan 2019 22:10:59 +0100")
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.21
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: <http://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.org@gnu.org
Original-Sender: "Emacs-devel" <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Xref: news.gmane.org gmane.emacs.devel:232301
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/232301>

Michael Albinus wrote:

> Maybe it is possible, to ask in the *release-branch*, whether this
> shall be merged to master. Interactively, when committing. This sole
> question would be sufficient, at least for me.

Maybe that is a check you could implement locally for your use, but I
really wouldn't worry about it.