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: Tue, 26 May 2015 22:48:43 +0000 Message-ID: References: <20150526223928.GA4675@acm.fritz.box> <5564F723.7060309@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a1146f784ad5461051703ed29 X-Trace: ger.gmane.org 1432680546 20371 80.91.229.3 (26 May 2015 22:49:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 May 2015 22:49:06 +0000 (UTC) To: Dmitry Gutov , Alan Mackenzie , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 00:48:55 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 1YxNeW-0006Bb-1K for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 00:48:52 +0200 Original-Received: from localhost ([::1]:50575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxNeV-0005rz-F3 for ged-emacs-devel@m.gmane.org; Tue, 26 May 2015 18:48:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxNeS-0005rm-60 for emacs-devel@gnu.org; Tue, 26 May 2015 18:48:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxNeN-0002WN-W6 for emacs-devel@gnu.org; Tue, 26 May 2015 18:48:48 -0400 Original-Received: from mail-qk0-f171.google.com ([209.85.220.171]:34968) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxNeN-0002WC-Rr for emacs-devel@gnu.org; Tue, 26 May 2015 18:48:43 -0400 Original-Received: by qkdn188 with SMTP id n188so102392064qkd.2 for ; Tue, 26 May 2015 15:48: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 :content-type; bh=76i7ckkY3Z/mxaaPXkIHF3BGQkgq/meg2gf/mulMABM=; b=gcRicWuqBZx/jqT4nxi0VBHvqEUU7CDagaDCoUu/IJuhlVGaWwCw+fq/nBjskLBl/L CTcD2DKtqfzTDiGCJb02FK6Y1MqBKTM6ozwEPwlOmO3UxF7jBB/IhyLo7OS60w7OF7gC 21Wcvy5zqanqb8NAytmq8ZRA5PEeAJut8DU8iyu4GFwadOSGtU1gmRuCf+aEhOROMiMT 9XOD5dnK637pw61Tu6VzewxZF4bWwUm69Mqo823lka36uMv8U7johfedBrDnFikPq9eY GtWbAmpznG0uDjQMGFkm1wYrxVKxNLbjJe033GNhTBHBqOww7J7TTIW7hok5928f6Oqm rr2w== X-Received: by 10.55.26.147 with SMTP id l19mr57563249qkh.59.1432680523451; Tue, 26 May 2015 15:48:43 -0700 (PDT) In-Reply-To: <5564F723.7060309@yandex.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.171 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:186831 Archived-At: --001a1146f784ad5461051703ed29 Content-Type: text/plain; charset=UTF-8 Alan, I missed part of your message, if you've already fixed it in the file, just git add $FILE && git commit to resolve. --001a1146f784ad5461051703ed29 Content-Type: text/html; charset=UTF-8

Alan,

I missed part of your message, if you've already fixed it in the file, just git add $FILE && git commit to resolve.




--001a1146f784ad5461051703ed29--