From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: In git, how does one revert a single file with merge conflicts in it? Date: Mon, 2 Feb 2015 19:32:21 +0000 Message-ID: <20150202193221.GD3673@acm.acm> References: <20150202120003.GA3673@acm.acm> <83mw4wguyh.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1422905592 23667 80.91.229.3 (2 Feb 2015 19:33:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Feb 2015 19:33:12 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 02 20:33:08 2015 Return-path: 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 ) id 1YIMk6-00048G-Bu for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 20:33:06 +0100 Original-Received: from localhost ([::1]:56169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIMk5-000655-OF for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 14:33:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIMk2-00064y-OH for emacs-devel@gnu.org; Mon, 02 Feb 2015 14:33:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIMjx-0004Bc-Pu for emacs-devel@gnu.org; Mon, 02 Feb 2015 14:33:02 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:27219 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIMjx-0004BT-HE for emacs-devel@gnu.org; Mon, 02 Feb 2015 14:32:57 -0500 Original-Received: (qmail 94674 invoked by uid 3782); 2 Feb 2015 19:32:54 -0000 Original-Received: from acm.muc.de (pD951BC19.dip0.t-ipconnect.de [217.81.188.25]) by colin.muc.de (tmda-ofmipd) with ESMTP; Mon, 02 Feb 2015 20:32:53 +0100 Original-Received: (qmail 11154 invoked by uid 1000); 2 Feb 2015 19:32:21 -0000 Content-Disposition: inline In-Reply-To: <83mw4wguyh.fsf@gnu.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x X-Received-From: 193.149.48.1 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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:182287 Archived-At: Hi, Eli. On Mon, Feb 02, 2015 at 06:05:26PM +0200, Eli Zaretskii wrote: > > Date: Mon, 2 Feb 2015 12:00:03 +0000 > > From: Alan Mackenzie > > On doing > > $ git cherry-pick -xe > > , I get a half error message: "error: could not apply f3f7acc... ...". > > Further investigation reveals that the cause is conflicts in a ChangeLog > > file. No surprises there. > I suggest that you install the git-merge-changelog program and > configure it as the merge driver for ChangeLog files. Then the > probability of such conflicts will be very close to zero. Thanks, I didn't know about this program. I'll see if I can get it working in my git. -- Alan Mackenzie (Nuremberg, Germany).