From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Richard Stallman <rms@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: merge conlict?
Date: Mon, 25 Jan 2010 19:04:43 -0500
Message-ID: <E1NZYvD-00042F-F9@fencepost.gnu.org>
References: <E1NZJ1t-00089o-ST@monty-python.gnu.org> <83vdeq634g.fsf@gnu.org>
Reply-To: rms@gnu.org
NNTP-Posting-Host: lo.gmane.org
Content-Type: text/plain; charset=ISO-8859-15
X-Trace: ger.gmane.org 1264464332 13699 80.91.229.12 (26 Jan 2010 00:05:32 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Tue, 26 Jan 2010 00:05:32 +0000 (UTC)
Cc: mhershberger@intrahealth.org, emacs-devel@gnu.org
To: Eli Zaretskii <eliz@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 01:05:24 2010
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 ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1NZYvs-0003mQ-9w
	for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 01:05:24 +0100
Original-Received: from localhost ([127.0.0.1]:58504 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1NZYvt-0007HV-3G
	for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 19:05:25 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NZYvK-0006vY-Gb
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:04:50 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NZYvF-0006sZ-6F
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:04:49 -0500
Original-Received: from [199.232.76.173] (port=57460 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NZYvE-0006sS-GG
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:04:44 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:50928)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <rms@gnu.org>) id 1NZYvE-0008EQ-5D
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:04:44 -0500
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <rms@gnu.org>)
	id 1NZYvD-00042F-F9; Mon, 25 Jan 2010 19:04:43 -0500
In-reply-to: <83vdeq634g.fsf@gnu.org> (message from Eli Zaretskii on Mon, 25
	Jan 2010 09:43:43 +0200)
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:120405
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/120405>

    What does this "merge conflict" in the commit message mean?

Whatever it means, it is too general.  This message ought to
say SOMETHING about what part of the code is being changed and what
the change does.

A response said:

    Both commits merge trunk into a branch.

"Merged trunk into a branch" implies that the branch has changed and
the trunk has not.  If so, why do we get a notification about it?  The
notifications are supposed to be for changes in the trunk, not for
changes in branches, right?