From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: dgutov@yandex.ru, emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict
Date: Mon, 20 Apr 2015 17:46:05 +0300 [thread overview]
Message-ID: <83egne6eoi.fsf@gnu.org> (raw)
In-Reply-To: <jwvoamjmsct.fsf-monnier+emacsdiffs@gnu.org>
> From: Stefan Monnier <monnier@IRO.UMontreal.CA>
> Date: Sun, 19 Apr 2015 22:48:24 -0400
> Cc: Dmitry Gutov <dgutov@yandex.ru>
>
> Actually, I think the above is too ad-hoc, testing `stashed' which is
> only tangentially related to the problem.
The bug was specifically about incorrect staging of stashed changes,
which were supposed to be left unstaged and uncommitted after
resolving the conflict. So I don't see how this is tangential to the
problem; AFAIU it _is_ the problem.
> Better would be for vc-git-resolve-when-done to check the status of the
> file and only `git add' it if it doesn't have anything staged yet.
Why should what we do with some file depend on whether there are other
changes staged? (Or maybe I don't understand what "it" means in this
case.)
> Or better yet, do the "mark as resolved" differently, which doesn't
> involved touching the "staging area". Not sure how to do that, but Git
> aficionados should be able to find some clever hack for that, involving
> less than 10 commands.
The way I know of is "git reset HEAD FILE". But is that safe in the
case in point?
prev parent reply other threads:[~2015-04-20 14:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20150419192734.3632.17817@vcs.savannah.gnu.org>
[not found] ` <E1YjusQ-0000xG-6u@vcs.savannah.gnu.org>
2015-04-20 2:48 ` [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict Stefan Monnier
2015-04-20 13:14 ` Dmitry Gutov
2015-04-20 13:35 ` Dmitry Gutov
2015-04-20 14:54 ` Eli Zaretskii
2015-04-20 15:25 ` Stefan Monnier
2015-04-20 15:54 ` Dmitry Gutov
2015-04-20 19:39 ` Stefan Monnier
2015-04-20 21:06 ` Dmitry Gutov
2015-04-20 14:46 ` Eli Zaretskii [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83egne6eoi.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=dgutov@yandex.ru \
--cc=emacs-devel@gnu.org \
--cc=monnier@IRO.UMontreal.CA \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.