Re: [RFC 0/3] Make git more user-friendly during a merge conflict

Stephen Leake [off-list ref] writes:

David Kastrup [off-list ref] writes:

quoted

Stephen Leake [off-list ref] writes:

quoted

David Kastrup [off-list ref] writes:

quoted

"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 bad, and should not be allowed. On the other hand, I have yet
to see an actual use case of bad behavior in this discussion.

Huh.

<http://permalink.gmane.org/gmane.comp.version-control.git/242744>

That's about backward incompatibility, which is bad, but not what I was
talking about above.

No, it isn't.  I quote:

    I sometimes run "git reset" during a merge to only reset the index
    and then examine the changes introduced by the merge. With your
    changes, someone doing so would abort the merge and discard the
    merge resolution.  I very rarely do this, but even rarely, I
    wouldn't like Git to start droping data silently for me ;-).

You should not make statements like "I have yet to see an actual use
case of bad behavior in this discussion" when you actually mean "I have
not yet seen anything I would be interested in doing myself".

-- 
David Kastrup