From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov 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: Wed, 27 May 2015 01:43:47 +0300 Message-ID: <5564F723.7060309@yandex.ru> References: <20150526223928.GA4675@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1432680296 16768 80.91.229.3 (26 May 2015 22:44:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 May 2015 22:44:56 +0000 (UTC) To: Alan Mackenzie , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 00:44:51 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 1YxNad-0004bN-5w for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 00:44:51 +0200 Original-Received: from localhost ([::1]:50565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxNac-0003ro-Pw for ged-emacs-devel@m.gmane.org; Tue, 26 May 2015 18:44:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxNZr-0002me-4d for emacs-devel@gnu.org; Tue, 26 May 2015 18:44:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxNZo-0005bU-FS for emacs-devel@gnu.org; Tue, 26 May 2015 18:44:03 -0400 Original-Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:36511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxNZo-0005Pg-9W for emacs-devel@gnu.org; Tue, 26 May 2015 18:44:00 -0400 Original-Received: by wgbgq6 with SMTP id gq6so109788393wgb.3 for ; Tue, 26 May 2015 15:43:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=45a5stZlz5IIDAaaGiZ++DX08bgsiEPJKQSe4P8jM7U=; b=sHtmOXyrJNolHgiFCydxKCLf+xsQkN8b8FMoVzftiBXMTja7jzJ+qK3zJZvdLH9tNU Slnkh/yNhaAWRIW0HxeJtMdu6EBITyXZBasUd//0FPY/L3thYKsM6Z1CNqCCnI+jUfiT pss24IeCcYcgLwk5OH9KZtwc8bx6VBh/veUj5AIeImdBvfGe49G7tK86u05+pYCbcrrt dwGfX7qtqIsRC+zRtQCbCY4wfC8w3/AN+a6zBSncE3iPpPh/aCnfZlKh5cJp0mGGhxmc 6vMb932f+o0Ii6D+kUgvU8oRRlzV5WQN6y8wnFaRucc+2pqCvA8dt1iIUID4HBxFUvEN 0XoQ== X-Received: by 10.180.13.40 with SMTP id e8mr44275775wic.50.1432680229257; Tue, 26 May 2015 15:43:49 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id w11sm23301446wjr.48.2015.05.26.15.43.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2015 15:43:49 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 In-Reply-To: <20150526223928.GA4675@acm.fritz.box> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::230 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:186829 Archived-At: Hi Alan, On 05/27/2015 01:39 AM, Alan Mackenzie wrote: > but the suggested recipe, as far as I am > aware, doesn't "mark resolution", instead it moves a file into a list of > files to be committed in the (?near) future. It does both. > Do I actually need to tell git that the merge conflicts in .gitignore > have been fixed? Need for what?