git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: David Kastrup <dak@gnu.org>
To: Stephen Leake <stephen_leake@stephe-leake.org>
Cc: git@vger.kernel.org
Subject: Re: [RFC 0/3] Make git more user-friendly during a merge conflict
Date: Fri, 28 Feb 2014 11:11:53 +0100	[thread overview]
Message-ID: <87fvn335sm.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <857g8f1ugu.fsf@stephe-leake.org> (Stephen Leake's message of "Fri, 28 Feb 2014 03:01:53 -0600")

Stephen Leake <stephen_leake@stephe-leake.org> writes:

> I like commands that "do the right thing". So no, this would not be
> confusing.

I _hate_ commands that think they know better than to do what they are
told.  In particular when doing destructive things.  And just because
_you_ like them does not mean they are not confusing.

In the long run, it is much more confusing if you come to rely on some
commands doing "the right thing" while in other cases, the actually
written thing is done.

"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.

-- 
David Kastrup

  parent reply	other threads:[~2014-02-28 10:12 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 ` [RFC 0/3] Make git more user-friendly during a merge conflict Jonathan Nieder
2014-02-28  9:01   ` Stephen Leake
2014-02-28  9:14     ` Charles Bailey
2014-02-28 10:11     ` David Kastrup [this message]
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=87fvn335sm.fsf@fencepost.gnu.org \
    --to=dak@gnu.org \
    --cc=git@vger.kernel.org \
    --cc=stephen_leake@stephe-leake.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).