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 03:38:57 +0300 Message-ID: <55651221.1060603@yandex.ru> References: <20150526223928.GA4675@acm.fritz.box> <55651004.40809@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1432687174 20376 80.91.229.3 (27 May 2015 00:39:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 00:39:34 +0000 (UTC) Cc: emacs-devel To: Kelvin White , bruce.connor.am@gmail.com, Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 02:39:29 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 1YxPNY-0004oe-5v for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 02:39:28 +0200 Original-Received: from localhost ([::1]:50808 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxPNX-0001y0-6w for ged-emacs-devel@m.gmane.org; Tue, 26 May 2015 20:39:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxPNT-0001xh-6a for emacs-devel@gnu.org; Tue, 26 May 2015 20:39:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxPNQ-0004BN-1K for emacs-devel@gnu.org; Tue, 26 May 2015 20:39:23 -0400 Original-Received: from mail-wg0-x233.google.com ([2a00:1450:400c:c00::233]:36130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxPNP-00046U-Ov; Tue, 26 May 2015 20:39:19 -0400 Original-Received: by wgbgq6 with SMTP id gq6so111120494wgb.3; Tue, 26 May 2015 17:38:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=K6GZi8NuMlgRRhPds74VSeHER+K9F69yOwXEIap/2vc=; b=q5WAFDIC5xzTVJZcIGZfJJ2MlF16XDERzD9erQIIOmYZGS0oKLspBqIgKetlV0DgI3 sB+s1yl6fV3795uPkP2rom6/Ye2rLBjreGR9dwJlKql12agxodmLAKpsyBbgf7yHq9Te M7NA3ueHFneaVh9kgHUYSkpaoKlnVsLH6bdqAmeSuFWs5/K24LQh/16It/zDQ9jYCMdw 1vMitD+SFq81cVHSE5FIGbsxRrDK2Gxht17ag4S7+2ynvjf9bbhqfX3xGZMCZKQ7Ia9z 3sPPxSA86lUXS35YZbCWwcQxt1+hj9xXscKBFpVWxwQR+awaLdwyc6ALMSTauWMvpGZC kmpw== X-Received: by 10.194.235.100 with SMTP id ul4mr52404763wjc.33.1432687139766; Tue, 26 May 2015 17:38:59 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id r9sm24154770wjo.26.2015.05.26.17.38.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2015 17:38:59 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::233 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:186842 Archived-At: On 05/27/2015 03:36 AM, Kelvin White wrote: > I created a new file in a directory under git version control, staged it > with `git add ', them unstaged it with `git rm --cached '. > This is the same behavior you'd expect in this situation. Well, it's not the same situation as what Alan has with .gitignore.