Re: Resuming M-x gitmerge

[Eli Zaretskii]

> From: Noam Postavsky <address@hidden>
> Date: Mon, 11 Jun 2018 08:40:21 -0400
> Cc: Eli Zaretskii <address@hidden>, Glenn Morris <address@hidden>, Emacs 
> developers <address@hidden>
> 
> >> 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.

That's an annoyance.  Why was the default changed, and why cannot
gitmerge override the default so manually running "git add" is not
required?