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

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Feb 26, 2014, 20:26 UTC
Message-ID: <20140226202601.GK7855@google.com>
In-Reply-To: <1393437985-31401-1-git-send-email-andrew.kw.w@gmail.com>

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.

Show 5 quoted lines

> We could stop here and hope that the users would read the messages, but I think
> git could be a bit more user-friendly. The last patch might be a bit more
> controversial. It changes the default behavior of "git reset" to default to
> "git reset --merge" during a merge conflict. I imagine that's what the user
> would want most of the time, and not "git reset --mixed".

I don't think that's a good idea. I'm not sure what new users would expect; in any case, making the command context-dependent just makes the learning process harder imho. And for experienced users, this would be a bad regression.

An 'advice' message pointing the user to 'git merge --abort' might make sense, though.

What do you think?

Thanks, Jonathan