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 01:52:43 +0000 Message-ID: References: <20150526223928.GA4675@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11353cbec67b970517067fed X-Trace: ger.gmane.org 1432691584 19011 80.91.229.3 (27 May 2015 01:53:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 01:53:04 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier , Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 03:53:04 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 1YxQWk-0003Tz-V1 for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 03:53:03 +0200 Original-Received: from localhost ([::1]:50948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQWk-0007NY-DP for ged-emacs-devel@m.gmane.org; Tue, 26 May 2015 21:53:02 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQWX-0007NT-SE for emacs-devel@gnu.org; Tue, 26 May 2015 21:52:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxQWT-0007S5-0U for emacs-devel@gnu.org; Tue, 26 May 2015 21:52:49 -0400 Original-Received: from mail-qk0-f169.google.com ([209.85.220.169]:34019) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQWS-0007Rs-SV for emacs-devel@gnu.org; Tue, 26 May 2015 21:52:44 -0400 Original-Received: by qkgx75 with SMTP id x75so104307161qkg.1 for ; Tue, 26 May 2015 18:52:44 -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 :cc:content-type; bh=pJc9FccB4IiiTliC4To9azeKJt4E4v/9myHgeY3enlE=; b=BSquyqYI+yBEgbQ8ArXOLSnBfA7Irn19hXBQmPgbJuHktpzb0PecGrJ62g/IrLUJlp I3/z03FgTVjjgJjZt99u7tN6m91CTTdIDTX8Q6pQ72L7Onf7wp/BFA6EEFwevW/wKw+5 shZTf2YiY7LtSbwwPlvU8EIdOS23Bc69WYn2iWRJ64VOsIg8wvaSDYvIkOfI0xpuXxTk hkEnQYo0jcIwuohFu8qGAKuTU1o9r8DO4yytMaTDaWu6f7JPEU3VAytZXutLTPriewDy anVphIbO7YodMiK6QQOQR6BEzmYe69kvfwm9w/nsR9FScQeduHVTvYvtWYlkamJmfkc3 qO+Q== X-Received: by 10.140.146.79 with SMTP id 76mr39478924qhs.27.1432691564508; Tue, 26 May 2015 18:52:44 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.169 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:186849 Archived-At: --001a11353cbec67b970517067fed Content-Type: text/plain; charset=UTF-8 On Tue, May 26, 2015, 9:41 PM Stefan Monnier 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 You want: git reset .gitignore This will not change the file itself, but it will mark the conflict as resolved, and it will not record the changes in the staging area (i.e. it will keep it as a local change that you don't intend to commit soon). Stefan "who has the same kind of situation" PS: Instead of modifying the .gitignore file, you might like to add your own idiosyncratic glob patterns to either .git/info/exclude or to ~/.config/git/ignore. See "git ignore --help". In my case I change .gitignore to remove the "*.rej" pattern in it, which I can't do via ~/.config/git/ignore or .git/info/exclude, but it sounds like in your case it should work. Which will have the exact same effects as `git rm --cached ' no? --001a11353cbec67b970517067fed Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


On Tue, May 26, 2015, 9:41 PM=C2=A0Stefan Monnier <monnier@iro.umontreal.ca> wrot= e:

>=C2=A0 =C2=A0 =C2=A0On branch master
>=C2=A0 =C2=A0 =C2=A0Your branch is up-to-date with 'origin/master&#= 39;.
>=C2=A0 =C2=A0 =C2=A0Unmerged paths:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0(use "git reset HEAD <file>...&qu= ot; to unstage)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0(use "git add <file>..." to = mark resolution)

>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0both mod= ified:=C2=A0 =C2=A0.gitignore

You want:

=C2=A0 =C2=A0 git reset .gitignore

This will not change the file itself, but it will mark the c= onflict as
resolved, and it will not record the changes in the staging area
(i.e. it will keep it as a local change that you don't intend to commit=
soon).

=C2=A0 =C2=A0 =C2=A0 =C2=A0 Stefan "who has the same ki= nd of situation"

PS: Instead of modifying the .gitignore file, you might like= to add your
own idiosyncratic glob patterns to either .git/info/exclude or to
~/.config/git/ignore.=C2=A0 See "git ignore --help".=C2=A0 In my = case I change
.gitignore to remove the "*.rej" pattern in it, which I can't= do via
~/.config/git/ignore or .git/info/exclude, but it sounds like in your
case it should work.

Which will have the exact same effects as `git rm --cached = <file>' no?


--001a11353cbec67b970517067fed--