git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Andrew Wong <andrew.kw.w@gmail.com>
Cc: git@vger.kernel.org, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [RFC 0/3] Make git more user-friendly during a merge conflict
Date: Wed, 26 Feb 2014 12:26:01 -0800	[thread overview]
Message-ID: <20140226202601.GK7855@google.com> (raw)
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.

> 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

  parent reply	other threads:[~2014-02-26 20:26 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-26 18:06 [RFC 0/3] Make git more user-friendly during a merge conflict Andrew Wong
2014-02-26 18:06 ` [RFC 1/3] wt-status: Make conflict hint message more consistent with other hints Andrew Wong
2014-02-26 20:34   ` Jonathan Nieder
2014-02-26 20:37   ` Junio C Hamano
2014-02-26 23:07     ` Andrew Wong
2014-02-26 18:06 ` [RFC 2/3] merge: Add hints to tell users about "git merge --abort" Andrew Wong
2014-02-26 20:38   ` Jonathan Nieder
2014-02-26 23:16     ` Andrew Wong
2014-03-05 15:30     ` Andrew Wong
2014-03-05 18:29       ` Junio C Hamano
2014-03-05 20:51         ` Andrew Wong
2014-03-05 21:20           ` Junio C Hamano
2014-03-05 18:35       ` Matthieu Moy
2014-02-26 18:06 ` [RFC 3/3] reset: Change the default behavior to use "--merge" during a merge Andrew Wong
2014-02-26 18:21   ` Matthieu Moy
2014-02-26 20:15     ` Andrew Wong
2014-02-26 20:48       ` Jonathan Nieder
2014-02-26 23:37         ` Andrew Wong
2014-02-26 20:57       ` Matthieu Moy
2014-02-27  0:00         ` Andrew Wong
2014-02-26 20:53     ` Junio C Hamano
2014-03-11  4:39       ` Andrew Wong
2014-02-26 20:26 ` Jonathan Nieder [this message]
2014-02-28  9:01   ` [RFC 0/3] Make git more user-friendly during a merge conflict Stephen Leake
2014-02-28  9:14     ` Charles Bailey
2014-02-28 10:11     ` David Kastrup
2014-02-28 14:13       ` Stephen Leake
2014-02-28 14:21         ` David Kastrup
2014-02-28 17:26           ` Stephen Leake
2014-02-28 17:33             ` David Kastrup
2014-03-01 10:32               ` Stephen Leake
2014-03-01 11:38                 ` Matthieu Moy
2014-03-01 16:50                   ` Stephen Leake

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140226202601.GK7855@google.com \
    --to=jrnieder@gmail.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=andrew.kw.w@gmail.com \
    --cc=git@vger.kernel.org \
    /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 public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).