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: In git, how does one revert a single file with merge conflicts in it? Date: Mon, 2 Feb 2015 12:00:03 +0000 Message-ID: <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 1422878471 8249 80.91.229.3 (2 Feb 2015 12:01:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Feb 2015 12:01:11 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 02 13:01:10 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 1YIFgj-0004mi-SO for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 13:01:10 +0100 Original-Received: from localhost ([::1]:54133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIFgj-00049H-2F for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 07:01:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIFgK-00040v-Ed for emacs-devel@gnu.org; Mon, 02 Feb 2015 07:00:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIFgE-0002Rd-Ap for emacs-devel@gnu.org; Mon, 02 Feb 2015 07:00:44 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:37329 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIFgD-0002Qo-Nw for emacs-devel@gnu.org; Mon, 02 Feb 2015 07:00:38 -0500 Original-Received: (qmail 13417 invoked by uid 3782); 2 Feb 2015 12:00:35 -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 13:00:34 +0100 Original-Received: (qmail 3767 invoked by uid 1000); 2 Feb 2015 12:00:03 -0000 Content-Disposition: inline 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:182245 Archived-At: Hello, Emacs. I'm attempting to backport a bug fix from master to emacs-24, following the procedure in .../admin/notes/git-workflow. 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. So, how do I revert ChangeLog to get rid of the conflicts? I've tried $ git checkout lisp/ChangeLog , but this just gives the puzzling error message "error: path 'lisp/ChangeLog' is unmerged". Isn't git great? How do I revert a file in git? TIA. -- Alan Mackenzie (Nuremberg, Germany).