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 11:26:23 +0000 Message-ID: References: <20150526223928.GA4675@acm.fritz.box> <556598A5.4090702@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a1134a8c68dd7fd05170e831a X-Trace: ger.gmane.org 1432726015 32047 80.91.229.3 (27 May 2015 11:26:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 11:26:55 +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 13:26:54 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 1YxZU5-00011d-EA for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 13:26:54 +0200 Original-Received: from localhost ([::1]:53179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxZU4-00043u-EQ for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 07:26:52 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxZTl-00043O-3Q for emacs-devel@gnu.org; Wed, 27 May 2015 07:26:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxZTg-0006X9-48 for emacs-devel@gnu.org; Wed, 27 May 2015 07:26:33 -0400 Original-Received: from mail-qg0-f48.google.com ([209.85.192.48]:34281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxZTg-0006X5-0G for emacs-devel@gnu.org; Wed, 27 May 2015 07:26:28 -0400 Original-Received: by qgez61 with SMTP id z61so2079128qge.1 for ; Wed, 27 May 2015 04:26:27 -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=TQKMwgOOPBO+mDXZ2jGdB2IBgCr5sbmb/xNLGOizslw=; b=MQN0wiNLpB0ZlkOVnAFGHUkuUWbqTfQ+mHzA06Hnv1UUaNJmlzyLeIPyJsS67RaSYj rvn8+ElIO24PHqS4wo9HeGuv5WK92GuNlyOxDLSms+090nIyNzeDOPBJgjFbNUeOKSPs jAjEVEQOmJ8X2SaEcvoKCnuuypj7l8RYqdGf8ppBu8SnwtJuTXKakTZ21NRTsP19YU4I ztCtdtyW3ym9E46kIH14HCMYb53n3ZGrMgiUfLo2/drYokW4eIYPsPW1qQnkGUB0GP5J xaCFcGLCyifzEE/Gbtg53CZna/9IcccFafMIBpER8GZIE6nhoLm/JUgRFLB0rrBAn3vo 55kw== X-Received: by 10.229.53.134 with SMTP id m6mr41380770qcg.30.1432725987643; Wed, 27 May 2015 04:26:27 -0700 (PDT) In-Reply-To: <556598A5.4090702@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:186862 Archived-At: --001a1134a8c68dd7fd05170e831a Content-Type: text/plain; charset=UTF-8 On Wed, May 27, 2015, 6:13 AM Dmitry Gutov wrote: > On 05/27/2015 06:14 AM, Kelvin White wrote: > > > In this case, this is exactly what you would want. Why would you want to > > keep this file in version control for everyone else? > > Because the contents of .gitignore are valuable, and we don't want > everyone to bother with recreating it. > > This should not remove it from someone's local working copy, only from the repository. --001a1134a8c68dd7fd05170e831a Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable



On Wed, May 27, 2015, 6:13 AM=C2=A0Dmitry Gu= tov <dgutov@yandex.ru> wrote:=
On 05/27/2015 06:14 AM, Kelvin White wro= te:

> In this case, this is exactly what you would want. Why would you want = to
> keep this file in version control for everyone else?

Because the contents of .gitignore are valuable, and we don't want
everyone to bother with recreating it.

This should not remove it from someone= 9;s local working copy, only from the repository.

--001a1134a8c68dd7fd05170e831a--