From: Eli Zaretskii <eliz@gnu.org>
To: Noam Postavsky <npostavs@gmail.com>
Cc: rgm@gnu.org, joaotavora@gmail.com, emacs-devel@gnu.org
Subject: Re: Resuming M-x gitmerge
Date: Mon, 11 Jun 2018 18:30:25 +0300 [thread overview]
Message-ID: <83fu1tqr1q.fsf@gnu.org> (raw)
In-Reply-To: <CAM-tV-_1OhsTWnca38UFT_EBVfzYydcyOM=Rncmbm8WzRXh2EQ@mail.gmail.com> (message from Noam Postavsky on Mon, 11 Jun 2018 08:40:21 -0400)
> From: Noam Postavsky <npostavs@gmail.com>
> Date: Mon, 11 Jun 2018 08:40:21 -0400
> Cc: Eli Zaretskii <eliz@gnu.org>, Glenn Morris <rgm@gnu.org>, Emacs developers <emacs-devel@gnu.org>
>
> >> 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?
next prev parent reply other threads:[~2018-06-11 15:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-10 23:54 Resuming M-x gitmerge Noam Postavsky
2018-06-11 2:37 ` Eli Zaretskii
2018-06-11 6:54 ` João Távora
2018-06-11 12:40 ` Noam Postavsky
2018-06-11 15:30 ` Eli Zaretskii [this message]
2018-06-11 15:46 ` Stefan Monnier
2018-06-11 16:00 ` Eli Zaretskii
2018-06-11 16:14 ` Noam Postavsky
2018-06-11 15:50 ` Glenn Morris
2018-06-11 16:12 ` Noam Postavsky
2018-06-11 18:18 ` Glenn Morris
2018-06-11 19:31 ` David Engster
2018-06-12 0:48 ` Noam Postavsky
2018-06-19 0:27 ` Noam Postavsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83fu1tqr1q.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=joaotavora@gmail.com \
--cc=npostavs@gmail.com \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).