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 13:12:53 +0300 Message-ID: <556598A5.4090702@yandex.ru> References: <20150526223928.GA4675@acm.fritz.box> 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 1432721615 23850 80.91.229.3 (27 May 2015 10:13:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 10:13:35 +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 12:13:30 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 1YxYL3-0008TQ-2T for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 12:13:29 +0200 Original-Received: from localhost ([::1]:52923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxYL1-00047D-Nt for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 06:13:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxYKx-00043s-Di for emacs-devel@gnu.org; Wed, 27 May 2015 06:13:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxYKu-0007HR-85 for emacs-devel@gnu.org; Wed, 27 May 2015 06:13:23 -0400 Original-Received: from mail-wg0-x234.google.com ([2a00:1450:400c:c00::234]:35111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxYKu-00077x-1Z; Wed, 27 May 2015 06:13:20 -0400 Original-Received: by wgme6 with SMTP id e6so5043806wgm.2; Wed, 27 May 2015 03:12:56 -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=519ATftQwoOFiFPsCKkyZHh7YqBEuLXq5a0sQLWu5BI=; b=1CDiqqs0buwwpa2/vVSwi3w71+1l6rCZGWzY9CHnW/jdVxS9hNjAo8fCGn3uGmzokz c/nYRahCZUnrghs/MXsUsa2V+JO50BFnauNxXGr67EISmJ30dr35SRiiZOvV4cFoAdmR Vp9C3nB7Y04ZmkgM6IrjmPiX+wxesha8bkZFcMqYWL1auAmR6hu877MOqJgI45GdbUYn J/6dShX61EUy2GvzewC9Ow4K2oe9vsaUTtSclwyAXkh7ULLVnoTBTGIGSy75pzUyPjmx t5TO/gDznc0VSIcTiAYVhT2XLT7KJZtO0cLoP79/y920AD4oKEksEzROUfGuS+nXWFGp oQTw== X-Received: by 10.180.72.176 with SMTP id e16mr4639209wiv.12.1432721576403; Wed, 27 May 2015 03:12:56 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id bm9sm26087586wjc.21.2015.05.27.03.12.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 May 2015 03:12:56 -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::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:186861 Archived-At: 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.