From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: In git, how does one revert a single file with merge conflicts in it? Date: Mon, 02 Feb 2015 12:40:04 -0500 Message-ID: References: <20150202120003.GA3673@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422898828 4786 80.91.229.3 (2 Feb 2015 17:40:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Feb 2015 17:40:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 02 18:40:28 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 1YIKz3-0004e4-P1 for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 18:40:25 +0100 Original-Received: from localhost ([::1]:55779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIKz3-0005xN-5w for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 12:40:25 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIKyo-0005wy-0s for emacs-devel@gnu.org; Mon, 02 Feb 2015 12:40:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIKyj-0007lg-W7 for emacs-devel@gnu.org; Mon, 02 Feb 2015 12:40:09 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:40026) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIKyj-0007ke-Su for emacs-devel@gnu.org; Mon, 02 Feb 2015 12:40:05 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AjsPAOwQflRsoX+8/2dsb2JhbABbgweDYIVaxR0EAgKBJBcBAQEBAQF8hAMBAQRWIxALDiYSFBgNJIhT1lkBAQEHAQEBAQEdkG8HhEgFiwGkLoF4hBkhgncBAQE X-IPAS-Result: AjsPAOwQflRsoX+8/2dsb2JhbABbgweDYIVaxR0EAgKBJBcBAQEBAQF8hAMBAQRWIxALDiYSFBgNJIhT1lkBAQEHAQEBAQEdkG8HhEgFiwGkLoF4hBkhgncBAQE X-IronPort-AV: E=Sophos;i="5.07,502,1413259200"; d="scan'208";a="109466268" Original-Received: from 108-161-127-188.dsl.teksavvy.com (HELO ceviche.home) ([108.161.127.188]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 02 Feb 2015 12:40:04 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id AFD7766100; Mon, 2 Feb 2015 12:40:04 -0500 (EST) In-Reply-To: <20150202120003.GA3673@acm.acm> (Alan Mackenzie's message of "Mon, 2 Feb 2015 12:00:03 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:182274 Archived-At: > $ 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"). Stefan