From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier 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 21:40:26 -0400 Message-ID: References: <20150526223928.GA4675@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432690847 8564 80.91.229.3 (27 May 2015 01:40:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 01:40:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 03:40:38 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 1YxQKj-0006IE-TG for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 03:40:38 +0200 Original-Received: from localhost ([::1]:50909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQKj-0005At-7T for ged-emacs-devel@m.gmane.org; Tue, 26 May 2015 21:40:37 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQKd-0005An-Ex for emacs-devel@gnu.org; Tue, 26 May 2015 21:40:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxQKa-0006YH-4t for emacs-devel@gnu.org; Tue, 26 May 2015 21:40:31 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:44482) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQKa-0006XZ-0P for emacs-devel@gnu.org; Tue, 26 May 2015 21:40:28 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CtCwA731xV/9N+3mhcgxCEAsEMCYdLBAICgTw5FAEBAQEBAQGBCkEFg10BAQMBViMFCwsOJhIUGA0kiDcIzyMBAQEHAgEfizqFBQeELQEEnxeSFINZI4FmVYFZIoJ4AQEB X-IPAS-Result: A0CtCwA731xV/9N+3mhcgxCEAsEMCYdLBAICgTw5FAEBAQEBAQGBCkEFg10BAQMBViMFCwsOJhIUGA0kiDcIzyMBAQEHAgEfizqFBQeELQEEnxeSFINZI4FmVYFZIoJ4AQEB X-IronPort-AV: E=Sophos;i="5.13,465,1427774400"; d="scan'208";a="122335153" Original-Received: from 104-222-126-211.cpe.teksavvy.com (HELO ceviche.home) ([104.222.126.211]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 26 May 2015 21:40:26 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 7EAED660ED; Tue, 26 May 2015 21:40:26 -0400 (EDT) In-Reply-To: <20150526223928.GA4675@acm.fritz.box> (Alan Mackenzie's message of "Tue, 26 May 2015 22:39:28 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:186847 Archived-At: > 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.