David Kastrup d...@gnu.org writes:
Stephen Leake stephen_le...@stephe-leake.org writes:
David Kastrup d...@gnu.org writes:
Stephen Leake stephen_le...@stephe-leake.org writes:
David Kastrup d...@gnu.org writes:
do the right thing commands also tend to do the wrong thing
occasionally
Stephen Leake stephen_le...@stephe-leake.org writes:
So as I understand it, this does _not_ lose your conflict resolutions.
Well, then maybe it's time to try the command before continuing
commenting on its behavior ;-).
$ git status
[...]
both modified: foo.txt
[...]
$ git diff
Matthieu Moy matthieu@grenoble-inp.fr writes:
$ git status
On branch master
nothing to commit, working directory clean
$
ok, you've lost your conflict resolutions.
In fact, it now seems that 'git reset --mixed' is always the same as
'git reset --merge'. So I must be missing something!
Jonathan Nieder jrnie...@gmail.com writes:
Hi,
Andrew Wong wrote:
The first two patches are just about rewording a message, and adding messages
to tell users to use git merge --abort to abort a merge.
Sounds like a good idea. I look forward to reading the patches.
We could stop here
On Fri, Feb 28, 2014 at 03:01:53AM -0600, Stephen Leake wrote:
Jonathan Nieder jrnie...@gmail.com writes:
And for experienced users, this would be a bad regression.
Backward incompatibility is a real concern.
It might be best if git reset (with _no_ option) be made to error out,
so all
Stephen Leake stephen_le...@stephe-leake.org writes:
I like commands that do the right thing. So no, this would not be
confusing.
I _hate_ commands that think they know better than to do what they are
told. In particular when doing destructive things. And just because
_you_ like them does
David Kastrup d...@gnu.org writes:
Stephen Leake stephen_le...@stephe-leake.org writes:
I like commands that do the right thing. So no, this would not be
confusing.
I _hate_ commands that think they know better than to do what they are
told. In particular when doing destructive things.
Stephen Leake stephen_le...@stephe-leake.org writes:
David Kastrup d...@gnu.org writes:
do the right thing commands also tend to do the wrong thing
occasionally with potentially disastrous results when they are used
in scripts where the followup actions rely on the actual result.
That is
David Kastrup d...@gnu.org writes:
Stephen Leake stephen_le...@stephe-leake.org writes:
David Kastrup d...@gnu.org writes:
do the right thing commands also tend to do the wrong thing
occasionally with potentially disastrous results when they are used
in scripts where the followup actions
Stephen Leake stephen_le...@stephe-leake.org writes:
David Kastrup d...@gnu.org writes:
Stephen Leake stephen_le...@stephe-leake.org writes:
David Kastrup d...@gnu.org writes:
do the right thing commands also tend to do the wrong thing
occasionally with potentially disastrous results when
Users may not be aware that they need to use git merge --abort or git reset
--merge to properly abort a merge conflict. They are likely to just use git
reset, because that usually cleans up the repo. But in the case where the
user had local changes, git reset would leave the repo in a messy state
Hi,
Andrew Wong wrote:
The first two patches are just about rewording a message, and adding messages
to tell users to use git merge --abort to abort a merge.
Sounds like a good idea. I look forward to reading the patches.
We could stop here and hope that the users would read the messages,
12 matches
Mail list logo
