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 00:56:09 +0000 Message-ID: References: <20150526223928.GA4675@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a1146693870ed59051705b53c X-Trace: ger.gmane.org 1432688179 3727 80.91.229.3 (27 May 2015 00:56:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 00:56:19 +0000 (UTC) To: Alan Mackenzie , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 02:56:19 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 1YxPdq-0003yT-Bq for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 02:56:18 +0200 Original-Received: from localhost ([::1]:50838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxPdp-0005DS-9R for ged-emacs-devel@m.gmane.org; Tue, 26 May 2015 20:56:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxPdl-0005CR-VT for emacs-devel@gnu.org; Tue, 26 May 2015 20:56:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxPdi-0007a6-Jp for emacs-devel@gnu.org; Tue, 26 May 2015 20:56:13 -0400 Original-Received: from mail-qg0-f53.google.com ([209.85.192.53]:34107) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxPdi-0007Zy-Eo for emacs-devel@gnu.org; Tue, 26 May 2015 20:56:10 -0400 Original-Received: by qgez61 with SMTP id z61so71939104qge.1 for ; Tue, 26 May 2015 17:56:10 -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=19Wvt3+8395Q3bqKz11ing63153Xw6bCxUXiUpP/X5E=; b=hqHqQqk5o71bMWqFBjXi6Gmir/jJ/eWIIbGrp0oDejbdHKJuTZiexx0sHip3R0tUl9 aWfVcLaW0c6at8eUyuNF8wyusKP7fmoH4F/b4OZb6hYNlg2fGQpKRKgozI/L8nWfbpt/ HHVXxLYOcBq7U43NwvcXhfvvVJRnBYtMN147JzZ9N1wCQle6Y3KiWykO2sHFuD8ebgqM ZtoVV4NsU8HdTurK29ev0GzrgGlMyS2rLz/Q89hAcwvhMSuPOdaPd8nWN7NM9P7iMJ2e jMmiN7yfm/LNLLFnOiwXtLMkC8w0/pqdez1pMBFRlAC5GDouS6qVxxlwrSDo4+gEYlC8 qCQA== X-Received: by 10.55.18.103 with SMTP id c100mr31052646qkh.2.1432688169904; Tue, 26 May 2015 17:56:09 -0700 (PDT) In-Reply-To: <20150526223928.GA4675@acm.fritz.box> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.53 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:186844 Archived-At: --001a1146693870ed59051705b53c Content-Type: text/plain; charset=UTF-8 On Tue, May 26, 2015, 6:39 PM Alan Mackenzie wrote: On branch master Your branch is up-to-date with 'origin/master'. Unmerged paths: (use "git reset HEAD ..." to unstage) (use "git add ..." to mark resolution) both modified: .gitignore I don't think I want to "unstage" anything ... Yes you do, unless you want the future changes to this file tracked by git in future --001a1146693870ed59051705b53c Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


On Tue, May 26, 2015, 6:39 PM=C2=A0Alan Mackenzie <acm@muc.de> wrote:


=C2=A0 =C2=A0 On branch master
=C2=A0 =C2=A0 Your branch is up-to-date with 'origin/master'.
=C2=A0 =C2=A0 Unmerged paths:
=C2=A0 =C2=A0 =C2=A0 (use "git reset HEAD <file>..." to uns= tage)
=C2=A0 =C2=A0 =C2=A0 (use "git add <file>..." to mark resol= ution)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 both modified:=C2= =A0 =C2=A0.gitignore


I don't think I want to "unstage" anything ...
Yes you do, unless you want the future changes to this file tracked by git = in future


=C2=A0

--001a1146693870ed59051705b53c--