[Top][All Lists]

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

Re: Resuming M-x gitmerge

From: Eli Zaretskii
Subject: Re: Resuming M-x gitmerge
Date: Mon, 11 Jun 2018 19:00:11 +0300

> 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

reply via email to

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