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 01:55:42 +0000 Message-ID: References: <20150526223928.GA4675@acm.fritz.box> <55651004.40809@yandex.ru> <55651221.1060603@yandex.ru> <5565162C.2090307@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11353cbe6abc230517068a10 X-Trace: ger.gmane.org 1432691764 21671 80.91.229.3 (27 May 2015 01:56:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 01:56:04 +0000 (UTC) Cc: emacs-devel To: Dmitry Gutov , bruce.connor.am@gmail.com, Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 03:56:03 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 1YxQZe-0004oC-QM for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 03:56:02 +0200 Original-Received: from localhost ([::1]:50960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQZe-0000Rz-5x for ged-emacs-devel@m.gmane.org; Tue, 26 May 2015 21:56:02 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQZS-0000Rt-Hx for emacs-devel@gnu.org; Tue, 26 May 2015 21:55:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxQZM-0000YX-AI for emacs-devel@gnu.org; Tue, 26 May 2015 21:55:50 -0400 Original-Received: from mail-qg0-f48.google.com ([209.85.192.48]:35324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQZL-0000Xw-Gx for emacs-devel@gnu.org; Tue, 26 May 2015 21:55:43 -0400 Original-Received: by qgg60 with SMTP id 60so20664535qgg.2 for ; Tue, 26 May 2015 18:55:43 -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=5piBz6L3WudED4vCis5IkBzf02ogwG0OCtxXNASNqLM=; b=WrXIRC3ESnfWw3tcKoh9Dx6kPn0lpQXlwzPWfaeNvRQYvdp7IbWUkExQ/c7oZI7cl0 5Qd/mXTnoBR5mxRn8r45gstL6MIyjlen5L1Qu+Eu7FQPeQGFBOYoyx7SfEpm4WLdgths coVcjbO2X2CrFuLIdi0nGGGHHpgQaLT/3qgK/YqOhVx7KvaSe3IvS2v3xOoqI5gTNj25 OkN1mMxjW5rzJipYIonhxGymOGdV+4V/USFDR7foudyT99Mvbz/nsnMJoBtRh1Dcqb9o JQdeMYMTDK71nIRGCcRcLlh0D08tKXxWpXvtvby0jxh5+JACQSv7U6GQ8/65+zrLFn6h CXkQ== X-Received: by 10.140.146.79 with SMTP id 76mr39489124qhs.27.1432691743044; Tue, 26 May 2015 18:55:43 -0700 (PDT) In-Reply-To: <5565162C.2090307@yandex.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.48 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:186850 Archived-At: --001a11353cbe6abc230517068a10 Content-Type: text/plain; charset=UTF-8 On Tue, May 26, 2015, 8:58 PM Dmitry Gutov wrote: On 05/27/2015 03:45 AM, Kelvin White wrote: > If I'm missing something, I apologize in advance, but please explain. .gitignore is already registered in the repository. 'git rm --cached && git commit' would commit its deletion (even though the file would remain on disk because of '--cached'). The 'git rm' part should be self-evident, isn't it? No, not with " --cached ". It only removes the file from the git "cache" (i.e. staging area) --001a11353cbe6abc230517068a10 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


On Tue, May 26, 2015, 8:58 PM=C2=A0Dmitry Gutov <dgutov@yandex.ru> wrote:

On 05/27/2015 03:45 AM, Kelvin White wrote:

> If I'm missing something, I apologize in advance, b= ut please explain.

.gitignore is already registered in the repository. 'git= rm --cached &&
git commit' would commit its deletion (even though the file would remai= n
on disk because of '--cached').

The 'git rm' part should be self-evident, isn't = it?


No, not with " --cached ". It only removes the file from the git = "cache" (i.e. staging area)


--001a11353cbe6abc230517068a10--