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:37:47 +0000 Message-ID: <20150202193747.GE3673@acm.acm> References: <20150202120003.GA3673@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1422905925 29101 80.91.229.3 (2 Feb 2015 19:38:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Feb 2015 19:38:45 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 02 20:38:45 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 1YIMpX-0007Nc-Ur for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 20:38:44 +0100 Original-Received: from localhost ([::1]:56199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIMpU-00028D-Bo for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 14:38:40 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIMpH-000288-J0 for emacs-devel@gnu.org; Mon, 02 Feb 2015 14:38:28 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIMpC-0005dh-JW for emacs-devel@gnu.org; Mon, 02 Feb 2015 14:38:27 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:16870 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIMpC-0005dZ-Ah for emacs-devel@gnu.org; Mon, 02 Feb 2015 14:38:22 -0500 Original-Received: (qmail 95380 invoked by uid 3782); 2 Feb 2015 19:38:20 -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:38:19 +0100 Original-Received: (qmail 11162 invoked by uid 1000); 2 Feb 2015 19:37:47 -0000 Content-Disposition: inline In-Reply-To: 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:182288 Archived-At: Hello, Stefan. On Mon, Feb 02, 2015 at 12:40:04PM -0500, Stefan Monnier wrote: > > $ 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. > IIUC git did perform the merge, you simply have a file with a conflict > as a result. If you visit the file in Emacs, it should show you the > conflicts and if once you've edited the file so as too remove the > conflict markers, upon saving the result, Emacs should mark the file as > "resolved" (which you can do manually with "git add lisp/ChangeLog"). OK. I think what confused me was me thinking that there shouldn't be "another" ChangeLog entry for the backported patch, given that there's already one for the original patch. But the ChangeLogs in Emacs 24 are not the same files as those in Emacs 25. Hence there needs to be an entry in both of them. > Stefan -- Alan Mackenzie (Nuremberg, Germany).