From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Resuming M-x gitmerge Date: Mon, 11 Jun 2018 08:40:21 -0400 Message-ID: References: <87h8mayz71.fsf@gmail.com> <83sh5uqc8w.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1528720757 25731 195.159.176.226 (11 Jun 2018 12:39:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 11 Jun 2018 12:39:17 +0000 (UTC) Cc: Glenn Morris , Eli Zaretskii , Emacs developers To: =?UTF-8?B?Sm/Do28gVMOhdm9yYQ==?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 11 14:39:13 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 1fSM6I-0006Zf-U9 for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 14:39:11 +0200 Original-Received: from localhost ([::1]:48547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSM8Q-0002MU-0O for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 08:41:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSM7X-0002KT-P3 for emacs-devel@gnu.org; Mon, 11 Jun 2018 08:40:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSM7W-00064r-SV for emacs-devel@gnu.org; Mon, 11 Jun 2018 08:40:27 -0400 Original-Received: from mail-ot0-x232.google.com ([2607:f8b0:4003:c0f::232]:37046) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSM7S-00062G-W4; Mon, 11 Jun 2018 08:40:23 -0400 Original-Received: by mail-ot0-x232.google.com with SMTP id 101-v6so23555530oth.4; Mon, 11 Jun 2018 05:40:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=kUF86H23hdwSvg+EkGpzYxRf62IwmaXRXcaIADAmTtM=; b=V0SxyXSod50r8pxFJjHKbow+/EUGdyHeDdqRRGQt1qZX40mp60yY3gq+1tGmxyZxdn 9JNVRj08Ve+jITw4vP3dLJwFInk1Y1HPuzVb6dQz57fgypmR+I+mXt77MOBaFzfJCLgo jggzAs3VOXCPLs9FzMRCu5E0jwWYl4ZfedRpg8Ql4R+KEUp2VMDGLB5u86mZmFbqGRnf srR6aHq3rB7Rd3qCbm6fpsGJKkC6Ecrl3BziON0jtaJONdFXMp8xGLlScAtqCL+C+alH 4huapC8FjrKbrqpSQJ2mCdlEqVHjC0S0m+uI1EoaD49PJA/CQBUJbvyMDmw7Dv/pmPSE Z4xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=kUF86H23hdwSvg+EkGpzYxRf62IwmaXRXcaIADAmTtM=; b=TWhsFjV3Ne7AXPH78RdVbdfyFFJROC+XJ2vHbtyEroLFXaRDdPvxFwwhCFE1T1DZBE oDHgPsqQgWVNgPjZG9lsDBidxsbD9lwLmF0wFkNn0OA4wiGXi0xIKF+TnQbrKKNJJW9B KzquavHFyOZC3An8Pdfrg1KzeDYWUiejbRF+r+RoVPLGKWiU+O2POXTVZY7b8AHwMATe q8uTmTOcp9DmG7ca1uiKDGxNGNv/Kau9aF+jbyYlskwCHuTiV8lUJeibEvqE/XcJFmzz ku3GB2ekIqSOPbCqtdloi1kAJYuASe1m1PbWuBhj2IOpjoB7EKCpkTXHHbCQiDwX6Apt 70Eg== X-Gm-Message-State: APt69E3JrzaqtxwBm1i+NdLl2XZ0zt+eADZavijVO1A8t31VGTccutty ICve3Wv36eLbMlvCOF8R39eEDPr/SAJi1lf6jR8= X-Google-Smtp-Source: ADUXVKLLO+3ub4sThlBXX9plvEoxiRew+qZQEY/xxbKiU1TPuh+ShBRmySsHSix/ha54eaHCkrv828X5gx5BJxiBsHk= X-Received: by 2002:a9d:2ce6:: with SMTP id e35-v6mr10417408otd.82.1528720822276; Mon, 11 Jun 2018 05:40:22 -0700 (PDT) Original-Received: by 2002:a4a:3b84:0:0:0:0:0 with HTTP; Mon, 11 Jun 2018 05:40:21 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c0f::232 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:226201 Archived-At: On 11 June 2018 at 02:54, Jo=C3=A3o T=C3=A1vora wrot= e: > On Mon, Jun 11, 2018, 03:38 Eli Zaretskii wrote: >> >> > 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). >> > 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. > > > 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.