From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Resuming M-x gitmerge Date: Mon, 11 Jun 2018 11:46:53 -0400 Message-ID: References: <87h8mayz71.fsf@gmail.com> <83sh5uqc8w.fsf@gnu.org> <83fu1tqr1q.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1528731962 18347 195.159.176.226 (11 Jun 2018 15:46:02 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 11 Jun 2018 15:46:02 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 11 17:45:58 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fSP0z-0004XK-2v for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 17:45:53 +0200 Original-Received: from localhost ([::1]:49688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSP36-0005EQ-9h for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 11:48:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSP2O-0005EA-KX for emacs-devel@gnu.org; Mon, 11 Jun 2018 11:47:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSP2L-0005Rh-JG for emacs-devel@gnu.org; Mon, 11 Jun 2018 11:47:20 -0400 Original-Received: from [195.159.176.226] (port=34088 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSP2L-0005RQ-Aa for emacs-devel@gnu.org; Mon, 11 Jun 2018 11:47:17 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1fSP0C-0003Vr-1I for emacs-devel@gnu.org; Mon, 11 Jun 2018 17:45:04 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 13 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:2ielLSNf0jcz9QQeZR8QacpA+h4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.159.176.226 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:226219 Archived-At: >> I think it's a new (default?) behaviour change in smerge-mode as of >> Emacs 25. Anyway, it doesn't matter for M-x gitmerge, because >> gitmerge-repo-clean checks for both staged and unstaged changes. >> Therefore it seems that you *must* "add resolved files and commit the >> merge yourself" in order to proceed. > That's an annoyance. Why was the default changed, and why cannot IIUC the change referred to is that before Emacs-25, VC didn't automatically "git add" when finishing an smerge session. IOW the annoyance affects Emacs<25 rather than Emacsā‰„25. Stefan