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 05:37:51 +0300 Message-ID: <83sh5uqc8w.fsf@gnu.org> References: <87h8mayz71.fsf@gmail.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1528684580 26399 195.159.176.226 (11 Jun 2018 02:36:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 11 Jun 2018 02:36:20 +0000 (UTC) Cc: rgm@gnu.org, emacs-devel@gnu.org To: Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 11 04:36:15 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 1fSCgm-0006kW-83 for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 04:36:12 +0200 Original-Received: from localhost ([::1]:46138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSCit-0008R7-CE for ged-emacs-devel@m.gmane.org; Sun, 10 Jun 2018 22:38:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSCiK-0008Qo-LJ for emacs-devel@gnu.org; Sun, 10 Jun 2018 22:37:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSCiH-0001N9-HM for emacs-devel@gnu.org; Sun, 10 Jun 2018 22:37:48 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSCiH-0001Mv-DW; Sun, 10 Jun 2018 22:37:45 -0400 Original-Received: from [176.228.60.248] (port=1355 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fSCiG-0000Bj-Go; Sun, 10 Jun 2018 22:37:44 -0400 In-reply-to: <87h8mayz71.fsf@gmail.com> (message from Noam Postavsky on Sun, 10 Jun 2018 19:54:58 -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:226181 Archived-At: > From: Noam Postavsky > Date: Sun, 10 Jun 2018 19:54:58 -0400 > Cc: Glenn Morris > > When M-x gitmerge hits a conflict, it shows a window with the message: > > Resolve the conflicts manually, then run gitmerge again. > Note: > - You don't have to add resolved files or commit the merge yourself (but you can). > - You can safely close this Emacs session and do this in a new one. > - When running gitmerge again, remember that you must do that from within the Emacs repo. > > The first note is either wrong, or I'm misunderstanding it. If I don't > 'git add' the resolved files and commit the merge, then trying to run > M-x gitmerge again fails with (user-error "Repository is not clean"). I was under the impression that resolving conflicts and saving the modified files automatically runs "git add" on the files.