From: Stephen Leake Date: Fri, 28 Feb 2014 09:01:53 GMT Subject: Re: [RFC 0/3] Make git more user-friendly during a merge conflict Message-ID: <857g8f1ugu.fsf@stephe-leake.org> In-Reply-To: <20140226202601.GK7855@google.com> Jonathan Nieder 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 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; As a newbie, I would like to know how to abort the merge, so I like this message. > in any case, making the command context-dependent just makes > the learning process harder imho. I like commands that "do the right thing". So no, this would not be confusing. > 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 users have to specify what they want. The transition process Junio proposed sounds good to me. -- -- Stephe