From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Resuming M-x gitmerge Date: Mon, 11 Jun 2018 18:30:25 +0300 Message-ID: <83fu1tqr1q.fsf@gnu.org> References: <87h8mayz71.fsf@gmail.com> <83sh5uqc8w.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1528730940 8897 195.159.176.226 (11 Jun 2018 15:29:00 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 11 Jun 2018 15:29:00 +0000 (UTC) Cc: rgm@gnu.org, joaotavora@gmail.com, emacs-devel@gnu.org To: Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 11 17:28:56 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 1fSOka-0002CF-BN for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 17:28:56 +0200 Original-Received: from localhost ([::1]:49587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSOmh-0005tE-Gx for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 11:31:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44056) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSOly-0005q9-Ao for emacs-devel@gnu.org; Mon, 11 Jun 2018 11:30:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSOlu-0006pA-Dy for emacs-devel@gnu.org; Mon, 11 Jun 2018 11:30:22 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46287) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSOlu-0006p3-AF; Mon, 11 Jun 2018 11:30:18 -0400 Original-Received: from [176.228.60.248] (port=2077 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fSOlt-0008I2-0o; Mon, 11 Jun 2018 11:30:17 -0400 In-reply-to: (message from Noam Postavsky on Mon, 11 Jun 2018 08:40:21 -0400) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:226217 Archived-At: > From: Noam Postavsky > Date: Mon, 11 Jun 2018 08:40:21 -0400 > Cc: Eli Zaretskii , Glenn Morris , Emacs developers > > >> I was under the impression that resolving conflicts and saving the > >> modified files automatically runs "git add" on the files. > > > > > > It does. Sometimes, but not always. I've never figured out the conditions > > that lead to each situation. I'm not using M-x gitmerge btw, just regular > > smerge. > > 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 gitmerge override the default so manually running "git add" is not required?