From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kelvin White 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 12:36:42 +0000 Message-ID: References: <20150526223928.GA4675@acm.fritz.box> <556598A5.4090702@yandex.ru> <5565ABBA.6000008@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11466938c96c0905170f7e6a X-Trace: ger.gmane.org 1432730219 4929 80.91.229.3 (27 May 2015 12:36:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 12:36:59 +0000 (UTC) Cc: Alan Mackenzie , emacs-devel@gnu.org To: Dmitry Gutov , Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 14:36:55 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 1YxaZr-0003B6-Gn for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 14:36:55 +0200 Original-Received: from localhost ([::1]:53745 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxaZq-0004M5-Or for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 08:36:55 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxaZm-0004Du-Kv for emacs-devel@gnu.org; Wed, 27 May 2015 08:36:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxaZf-000874-5m for emacs-devel@gnu.org; Wed, 27 May 2015 08:36:50 -0400 Original-Received: from mail-qk0-f174.google.com ([209.85.220.174]:35479) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxaZf-00086y-2k for emacs-devel@gnu.org; Wed, 27 May 2015 08:36:43 -0400 Original-Received: by qkdn188 with SMTP id n188so4305577qkd.2 for ; Wed, 27 May 2015 05:36:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-type; bh=51jz6ubi4U815TXJUfOnWmLxWI4ehvY5TFIVL7n3/1Q=; b=Dn3+Ovdle8BpAbEg7i1mBJv0wwSTz4EPf3iuT5XLaBoUVW9ydiZCHLvR+in3Ul/3KS 0NcTSTCphxo6uaISiWtipoSmJ7WI8YjEEmx825xB7GA5NrNWKMKoKMItlMCiQF1K/9c+ eiTcjuXT54rJgjF5TX/3US1OZtWaBvX5BKPthSObZxLaSGsJg1Y+aCMFCDv6JsJqG1D7 vhHccQ3Xp/dzOTz8FK7nkd9ePqHL/2e+vxTuOJmMhELyx7qCDLLwnIuo0mczFXvGCkrw y049A75aZD+RwhhEvRGtaZLijwWC5Ne7Du9zcNWx4v8qsSlbGElos0Hk5vSIbAg49dIv 5yLA== X-Received: by 10.55.18.103 with SMTP id c100mr35441481qkh.2.1432730202629; Wed, 27 May 2015 05:36:42 -0700 (PDT) In-Reply-To: <5565ABBA.6000008@yandex.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.174 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:186866 Archived-At: --001a11466938c96c0905170f7e6a Content-Type: text/plain; charset=UTF-8 On Wed, May 27, 2015 at 7:34 AM Dmitry Gutov wrote: > 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. > Because I think you are misunderstanding that the file will only be removed locally, from another persons working directory had that file been tracked before. If this is a new file, that hasn't been tracked and you don't want it tracked, Then this _is_ the obvious solution. --001a11466938c96c0905170f7e6a Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


On Wed, May 27, 2015 at= 7:34 AM Dmitry Gutov <dgutov@yandex= .ru> wrote:
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 no= t the
right solution.=C2=A0
=C2=A0
Because I think you are misunderstanding that the file = will only be removed locally, from another persons working directory had th= at file been tracked before. If this is a new file, that hasn't been tr= acked and you don't want it tracked, Then this _is_ the obvious solutio= n. =C2=A0
--001a11466938c96c0905170f7e6a--