[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Resuming M-x gitmerge

From: Noam Postavsky
Subject: Re: Resuming M-x gitmerge
Date: Mon, 11 Jun 2018 12:14:36 -0400

On 11 June 2018 at 12:00, Eli Zaretskii <address@hidden> wrote:
>> From: Stefan Monnier <address@hidden>
>> Date: Mon, 11 Jun 2018 11:46:53 -0400
>> >> 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
>> IIUC the change referred to is that before Emacs-25, VC didn't
>> automatically "git add" when finishing an smerge session.
>> IOW the annoyance affects Emacs<25 rather than Emacs≥25.
> OK, but then why doesn't it work for Noam with the current versions of
> Emacs?

Miscommunication; when I said that I had "add resolved files" I
considered using smerge to automatically to call 'git add'
automatically as adding the resolved files (i.e., that gitmerge.el
doesn't do it).
Anyway, the real question is about the committing the merge it seems.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]