From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
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 05:37:15 +0300
Message-ID: <83617ezqxw.fsf@gnu.org>
References: <20150526223928.GA4675@acm.fritz.box>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: plane.gmane.org
X-Trace: ger.gmane.org 1432694270 26297 80.91.229.3 (27 May 2015 02:37:50 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Wed, 27 May 2015 02:37:50 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Alan Mackenzie <acm@muc.de>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 04:37:43 2015
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1YxRDy-0005rd-5a
	for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 04:37:42 +0200
Original-Received: from localhost ([::1]:51415 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1YxRDx-0007yD-6h
	for ged-emacs-devel@m.gmane.org; Tue, 26 May 2015 22:37:41 -0400
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59283)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1YxRDu-0007y0-5F
	for emacs-devel@gnu.org; Tue, 26 May 2015 22:37:38 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1YxRDj-00057T-5f
	for emacs-devel@gnu.org; Tue, 26 May 2015 22:37:38 -0400
Original-Received: from mtaout21.012.net.il ([80.179.55.169]:57578)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1YxRDi-000569-LX
	for emacs-devel@gnu.org; Tue, 26 May 2015 22:37:26 -0400
Original-Received: from conversion-daemon.a-mtaout21.012.net.il by
	a-mtaout21.012.net.il (HyperSendmail v2007.08) id
	<0NOZ00H00KGLI300@a-mtaout21.012.net.il> for
	emacs-devel@gnu.org; Wed, 27 May 2015 05:37:25 +0300 (IDT)
Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0NOZ00HEPLYCH860@a-mtaout21.012.net.il>;
	Wed, 27 May 2015 05:37:24 +0300 (IDT)
In-reply-to: <20150526223928.GA4675@acm.fritz.box>
X-012-Sender: halo1@inter.net.il
X-detected-operating-system: by eggs.gnu.org: Solaris 10
X-Received-From: 80.179.55.169
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:186854
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/186854>

> Date: Tue, 26 May 2015 22:39:28 +0000
> From: Alan Mackenzie <acm@muc.de>
> 
> Where is this 'bzr resolve' equivalent documented?

In your situation, the equivalent is "git reset .gitignore".