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 14:34:18 +0300 Message-ID: <5565ABBA.6000008@yandex.ru> References: <20150526223928.GA4675@acm.fritz.box> <556598A5.4090702@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 1432726517 7581 80.91.229.3 (27 May 2015 11:35:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 11:35:17 +0000 (UTC) Cc: Alan Mackenzie , emacs-devel@gnu.org To: Kelvin White , Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 13:35:01 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 1YxZbu-0004rk-EZ for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 13:34:58 +0200 Original-Received: from localhost ([::1]:53198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxZbt-0007DH-Fb for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 07:34:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxZbg-0007D2-IW for emacs-devel@gnu.org; Wed, 27 May 2015 07:34:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxZbd-0000f6-Dp for emacs-devel@gnu.org; Wed, 27 May 2015 07:34:44 -0400 Original-Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:33749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxZbd-0000bl-6f; Wed, 27 May 2015 07:34:41 -0400 Original-Received: by wicmx19 with SMTP id mx19so90679640wic.0; Wed, 27 May 2015 04:34:21 -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=o8Kg7Q1sQIB+V783ksnYkdEwGFr3FLtzEK0z3bjK9RY=; b=k/UjVoQ5NXiaqLd/BcioUsLzej13+p7T6YFjwmwUof7eHY1ok2votKPg8H69SMedIR Jul5v5mBv/WjgxCZeyFdxc9OlWM6zQpRqkPdZrYeFiNFytbrAf7nPUqDxmpyMYH++8d3 bt8HPtVq7EbdXPsm1XHJBx6828PkSxTTsqXYK43XyD3NaG72hb/ui3a+A+3hoU25EGu/ 7vfFq0lSSQlloK1MiUljZy5OEbIyTx/I6QY1tGiIAhaeKE9zz0Cw1lk4W9jpr0nUGfF8 oydZ5yhbIiOcGFJ1nWdQrs75XXtrmaM3j1TZsAOABlvoO+bGBflgEDGUWHANgttwa8yi L2uA== X-Received: by 10.194.235.4 with SMTP id ui4mr35213332wjc.0.1432726460975; Wed, 27 May 2015 04:34:20 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id lh8sm26432339wjc.23.2015.05.27.04.34.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 May 2015 04:34:20 -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:c05::234 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:186863 Archived-At: On 05/27/2015 02:26 PM, Kelvin White wrote: > This should not remove it from someone's local working copy, only from > the repository. It'll be removed from everyone else's working directories next time they do a pull. Why are we still discussing this? 'git rm --cached' is obviously not the right solution.