From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab 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 10:17:10 +0200 Message-ID: References: <20150526223928.GA4675@acm.fritz.box> <5564F723.7060309@yandex.ru> <20150526225641.GB4675@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432714669 4115 80.91.229.3 (27 May 2015 08:17:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 08:17:49 +0000 (UTC) Cc: Dmitry Gutov , Kelvin White , emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 10:17:40 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 1YxWWv-0008Hf-Ro for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 10:17:37 +0200 Original-Received: from localhost ([::1]:52460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxWWu-0005O8-Fx for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 04:17:36 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxWWb-0005NL-FD for emacs-devel@gnu.org; Wed, 27 May 2015 04:17:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxWWW-0005LT-9r for emacs-devel@gnu.org; Wed, 27 May 2015 04:17:17 -0400 Original-Received: from cantor2.suse.de ([195.135.220.15]:56745 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxWWW-0005KG-3s; Wed, 27 May 2015 04:17:12 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Original-Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B2BEEAB12; Wed, 27 May 2015 08:17:10 +0000 (UTC) X-Yow: .. the HIGHWAY is made out of LIME JELLO and my HONDA is a barbequed OYSTER! Yum! In-Reply-To: <20150526225641.GB4675@acm.fritz.box> (Alan Mackenzie's message of "Tue, 26 May 2015 22:56:41 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 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:186860 Archived-At: Alan Mackenzie writes: > It is my own personal copy of .gitignore Don't. Use .git/info/exclude. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."