From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: =?UTF-8?B?Sm/Do28gVMOhdm9yYQ==?= Newsgroups: gmane.emacs.devel Subject: Re: Resuming M-x gitmerge Date: Mon, 11 Jun 2018 07:54:00 +0100 Message-ID: References: <87h8mayz71.fsf@gmail.com> <83sh5uqc8w.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="00000000000091cbfc056e583763" X-Trace: blaine.gmane.org 1528699937 12987 195.159.176.226 (11 Jun 2018 06:52:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 11 Jun 2018 06:52:17 +0000 (UTC) Cc: Glenn Morris , Noam Postavsky , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 11 08:52:12 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 1fSGgW-0003Gt-3u for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 08:52:12 +0200 Original-Received: from localhost ([::1]:46813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSGid-0006v3-8x for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 02:54:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSGiW-0006uj-O2 for emacs-devel@gnu.org; Mon, 11 Jun 2018 02:54:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSGiV-0003e3-OG for emacs-devel@gnu.org; Mon, 11 Jun 2018 02:54:16 -0400 Original-Received: from mail-io0-x22b.google.com ([2607:f8b0:4001:c06::22b]:36911) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSGiS-0003d1-Uq; Mon, 11 Jun 2018 02:54:13 -0400 Original-Received: by mail-io0-x22b.google.com with SMTP id s26-v6so22686929ioj.4; Sun, 10 Jun 2018 23:54:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=9iKSx5EQZ7clzg8vsSu1rluvnLWwumHf3D3eZ7N3c/A=; b=p2AMpNyudm6/M2NlmElvv6uEgCuTuD0FqfsDqMm3ZpQwuipYdytm9/pW29jaxlb6F+ V+PWGKELXrJ9vCD7c5KmDSyGPWsi26i3wMXNNYJqWVzee7oXzjaqrA8tBmWzIwMAk+t1 WG+dEPS/biJSHlmGPCW2e2fgwPkBufxz7ltEJ7lihf8FKnlVgSB3cccfNBkQXgJTK7BN oOmxqpWgaMW8xeUI7WtXfH2ImBA4TPjmk99FGjii5g6VqI1MX6ogbApGbJP742YyS1Mr xAmjm4WDZ2nhjx75Q4ilodJtbj42NXnIsd2jc44f+HGVfaGF17rRGlIAEqwwdUvSbQ8i kIeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=9iKSx5EQZ7clzg8vsSu1rluvnLWwumHf3D3eZ7N3c/A=; b=p9uvQ0VeociQfw5PXHMaflUZgPSUN1SqdzlgBA69ElS7hcV47YBv20S4kc7CBlTRX2 CK2ImTx/2vm+hQ8rNiB3+6MVTn6kMjAEM1cBiC6VSS5eGK8b+XxZVNMbcDCjxvY0VM5I MLscIMlyY6ApjTpNWk/wNhextyeNm9Qrb+7n3Z/M7h5uthc1nVHga9Rddpq8pGm1NVVD l1nxL7G02WO28aYT0pgGStalV0vubpjjkA2p0qtJqZyXdFtUOGNXT5PJf/JYPeyEKKz7 SLeERfGQZeJrA4xISbSKPFjSKvkpJ3mn7gApLDGl/VQojzcqYAmS/RYahelFpaglMbwz ywXw== X-Gm-Message-State: APt69E1qTcF7Y3k05QeQP5/LB7M9TkVtJdMoiamSuUqKQhRODQEajmlw RJDEIUZCOiebFebaNRM8Mj/0EId7X1FXv2oi3lq+Ww== X-Google-Smtp-Source: ADUXVKJhBE1MpeooMYD4QtdBkuecSxygeYya+ygG46oHQGj+9SlCtCNR68TPvmrOKZsrmLRpnoi+K5o/wdzjmEnO20k= X-Received: by 2002:a6b:2909:: with SMTP id p9-v6mr13911540iop.28.1528700052021; Sun, 10 Jun 2018 23:54:12 -0700 (PDT) In-Reply-To: <83sh5uqc8w.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c06::22b 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:226187 Archived-At: --00000000000091cbfc056e583763 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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). > > - You can safely close this Emacs session and do this in a new on= e. > > - When running gitmerge again, remember that you must do that fro= m > 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. > 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. Jo=C3=A3o --00000000000091cbfc056e583763 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Mon, = Jun 11, 2018, 03:38 Eli Zaretskii <eliz@= gnu.org> wrote:
> From: N= oam Postavsky <npostavs@gmail.com>
> Date: Sun, 10 Jun 2018 19:54:58 -0400
> Cc: Glenn Morris <rgm@gnu.org>
>
> When M-x gitmerge hits a conflict, it shows a window with the message:=
>
>=C2=A0 =C2=A0 =C2=A0Resolve the conflicts manually, then run gitmerge a= gain.
>=C2=A0 =C2=A0 =C2=A0Note:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0- You don't have to add resolved files o= r commit the merge yourself (but you can).
>=C2=A0 =C2=A0 =C2=A0 =C2=A0- You can safely close this Emacs session an= d do this in a new one.
>=C2=A0 =C2=A0 =C2=A0 =C2=A0- 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.=C2=A0 = 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 clea= n").

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 sm= erge.

Jo=C3=A3o
--00000000000091cbfc056e583763--