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 12:12:09 -0400 Message-ID: References: <87h8mayz71.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1528733487 27710 195.159.176.226 (11 Jun 2018 16:11:27 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 11 Jun 2018 16:11:27 +0000 (UTC) Cc: Emacs developers To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 11 18:11:23 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 1fSPPe-00076e-4B for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 18:11:22 +0200 Original-Received: from localhost ([::1]:49940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSPRl-0004kS-6f for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 12:13:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSPQT-0004XZ-LD for emacs-devel@gnu.org; Mon, 11 Jun 2018 12:12:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSPQS-0000Cr-M3 for emacs-devel@gnu.org; Mon, 11 Jun 2018 12:12:13 -0400 Original-Received: from mail-ot0-x22e.google.com ([2607:f8b0:4003:c0f::22e]:43281) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSPQR-0000BW-7l; Mon, 11 Jun 2018 12:12:11 -0400 Original-Received: by mail-ot0-x22e.google.com with SMTP id i19-v6so24429987otk.10; Mon, 11 Jun 2018 09:12:11 -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; bh=m+bGUG/rWJW5f0D8ImEI9JoOVHUaOXJf7NvjplucTI0=; b=qXYZG71uTLelmMW6zu/376ZQJ+jCEF3i3qna3ea+aGMnKCALrKaTWGpaFvLvsDIsa5 X+u8KkT6Fl7KsNFU7H0swH4BeHD+DrtCBo4X/H/Tq3fzm2aiNUrxtpdz21DOMpVnMZsa N+SGzhUXjUiB8IZSyeelNCKPyxtKbWfBJzZalzY+viCgebT+vBP8GtouU/9P30FG7wU5 moiLqQv9niCyw4Fj+eMsYNzVPrkc4NiORXhw2sGy5F59Ik5lf08iD20KSjkzRlPzrWNA iFwVeknVOqGN29lUNJCYEWgZZTxwfkdPi2eYgLgMBy1UzoI6+wxH7uc3RR4kdtHcqyWr 7S/g== 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; bh=m+bGUG/rWJW5f0D8ImEI9JoOVHUaOXJf7NvjplucTI0=; b=aktPGQkBJ0Awp9wCyotmFodzqtkC22nQ/WQOLAqcW8EXuONTlN6DwlkUsgtdSbuf7q H0MwZb6GqwFtW/B1g2ezdUBhR4oRbszGL8LeumL576eC8Rhg5dq0HQ56/BjM+hZeCdpt KIh5Pk8/CymC96UwaJ60kJMZhgJaeWRaetLfTZqGVzx9Ul6wDlJHnPBxq2KbXcGIVkcJ r57ijUaExeQCTdbSkSViWag1Do09FAksDuYAfrIoT7/Zn8SeRiJUyZZ0faeUS2zg8vbE CjFZgPHFFwMaa1/gLWZMsZgNAd4tbphfRoucB3zssEnzW0Qm2+Nh+jr+WfBzf3JcusfE Tbog== X-Gm-Message-State: APt69E3ayX7blfeljnDDTKczCu3aLT/rvgi3m2aQdB91MdzFsLKvV+F2 SA7b2XKADjj++j/g+lJ9vWGVU/YuSIu/oswFkLM= X-Google-Smtp-Source: ADUXVKJwbFCww0GbkckimGHEowB26Frq+EXbKjvRIGp9odEDi2ByM3oneJvNLnqpfx2DJxpgLlqJgCZ7gkAKch9jWrM= X-Received: by 2002:a9d:577d:: with SMTP id x58-v6mr11038933oti.196.1528733530515; Mon, 11 Jun 2018 09:12:10 -0700 (PDT) Original-Received: by 2002:a4a:3b84:0:0:0:0:0 with HTTP; Mon, 11 Jun 2018 09:12:09 -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::22e 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:226224 Archived-At: On 11 June 2018 at 11:50, Glenn Morris wrote: > Noam Postavsky wrote: > >> 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"). > > Maybe it's just badly worded? You have to resolve the conflict someway. > This is either by editing the conflicted file and using "git add" to > mark it as resolved, or by reset+checkout (or whatever the voodooo is) > to discard the changes altogether. I don't remember needing to manually > "commit" myself. Normally I think I do: > > M-x gitmerge > fix conflict > git add to mark conflict resolved > (unless eg smerge has automatically done that) > M-x gitmerge Hmm, this didn't work for me, I needed to commit the merge. And given the current implementation of gitmerge-repo-clean I can't see how it could work any other way. > So maybe it should just say "You don't have to commit the merge yourself..." Yes (assuming it's supposed to work without committing the merge) I would find this wording clearer.