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: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed? Date: Tue, 26 May 2015 22:56:41 +0000 Message-ID: <20150526225641.GB4675@acm.fritz.box> References: <20150526223928.GA4675@acm.fritz.box> <5564F723.7060309@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1432680996 27495 80.91.229.3 (26 May 2015 22:56:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 May 2015 22:56:36 +0000 (UTC) Cc: emacs-devel@gnu.org, Dmitry Gutov To: Kelvin White Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 00:56:27 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 1YxNlr-0000o5-3y for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 00:56:27 +0200 Original-Received: from localhost ([::1]:50592 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxNlq-00072q-Ev for ged-emacs-devel@m.gmane.org; Tue, 26 May 2015 18:56:26 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxNlm-00072h-Dl for emacs-devel@gnu.org; Tue, 26 May 2015 18:56:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxNlj-0001V8-Uj for emacs-devel@gnu.org; Tue, 26 May 2015 18:56:22 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:26794 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxNlj-0001UT-LR for emacs-devel@gnu.org; Tue, 26 May 2015 18:56:19 -0400 Original-Received: (qmail 48406 invoked by uid 3782); 26 May 2015 22:56:18 -0000 Original-Received: from acm.muc.de (p5B146D85.dip0.t-ipconnect.de [91.20.109.133]) by colin.muc.de (tmda-ofmipd) with ESMTP; Wed, 27 May 2015 00:56:17 +0200 Original-Received: (qmail 5019 invoked by uid 1000); 26 May 2015 22:56:41 -0000 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.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:186832 Archived-At: Hello, Kelvin. On Tue, May 26, 2015 at 10:48:43PM +0000, Kelvin White wrote: > Alan, > I missed part of your message, if you've already fixed it in the file, just > git add $FILE && git commit to resolve. No. The file is not to be committed. It is my own personal copy of .gitignore with my idiosyncratic filenames in it, something I will not impose upon fellow Emacs hackers. How do I tell git the conflict has been fixed - not as a part of doing something else (which must not be done), but as a primitive operation? This surely must be possible in such a sophisticated SCM tool. -- Alan Mackenzie (Nuremberg, Germany).