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

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 where merged changes and local changes are mixed together.

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.

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 haven't updated the "git reset" docs yet, I'll update it if we decide to use this new behavior.

Comments?

Andrew Wong (3):
  wt-status: Make conflict hint message more consistent with other hints
  merge: Add hints to tell users about "git merge --abort"
  reset: Change the default behavior to use "--merge" during a merge

 builtin/merge.c | 3 ++-
 builtin/reset.c | 7 ++++++-
 wt-status.c     | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)