From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: The ChangeLog and merge conflicts
Date: Tue, 10 Feb 2015 05:43:40 +0200
Message-ID: <83lhk68m8j.fsf@gnu.org>
References: <CAAdUY-+7hjTB6k=nzC37_Dnm2VWe3tvworne6fmABRkpwjLdXw@mail.gmail.com>
	<CAAdUY-Kx+AjHDEoYVzfERFWFRMArrCMvqY3TTB1vndsQAUxwnA@mail.gmail.com>
	<CAAdUY-LyCBThR5PJFPuPf-mNbgFvn5NWGnKgeeh7QVXViaFqTg@mail.gmail.com>
	<CAAdUY-L5xss_Zjpo34r3Mwu67SpcsENSfjEs+pBfPVkTwJw0vg@mail.gmail.com>
	<871tlytyut.fsf@fencepost.gnu.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: plane.gmane.org
X-Trace: ger.gmane.org 1423539857 30462 80.91.229.3 (10 Feb 2015 03:44:17 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Tue, 10 Feb 2015 03:44:17 +0000 (UTC)
Cc: bruce.connor.am@gmail.com, emacs-devel@gnu.org
To: David Kastrup <dak@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 10 04:44:15 2015
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 ([208.118.235.17])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1YL1kF-0003vp-2s
	for ged-emacs-devel@m.gmane.org; Tue, 10 Feb 2015 04:44:15 +0100
Original-Received: from localhost ([::1]:36762 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 1YL1kD-0000ZK-Nq
	for ged-emacs-devel@m.gmane.org; Mon, 09 Feb 2015 22:44:13 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59958)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1YL1k0-0000Yt-MR
	for emacs-devel@gnu.org; Mon, 09 Feb 2015 22:44:01 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1YL1jz-0007st-TO
	for emacs-devel@gnu.org; Mon, 09 Feb 2015 22:44:00 -0500
Original-Received: from mtaout29.012.net.il ([80.179.55.185]:45266)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1YL1ju-0007rt-DF; Mon, 09 Feb 2015 22:43:54 -0500
Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il
	(HyperSendmail v2007.08) id <0NJJ00J00DFXRG00@mtaout29.012.net.il>;
	Tue, 10 Feb 2015 05:40:03 +0200 (IST)
Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0NJJ00EMZE6QTB60@mtaout29.012.net.il>;
	Tue, 10 Feb 2015 05:40:03 +0200 (IST)
In-reply-to: <871tlytyut.fsf@fencepost.gnu.org>
X-012-Sender: halo1@inter.net.il
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 80.179.55.185
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
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-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:182773
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/182773>

> From: David Kastrup <dak@gnu.org>
> Date: Tue, 10 Feb 2015 01:05:30 +0100
> Cc: emacs-devel <emacs-devel@gnu.org>
> 
> Take a look for the git-merge-changelog program (the respective Debian
> package is called just that).

Indeed.  I'm using it and I have zero conflicts in ChangeLog files.