git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Andrew Wong <andrew.kw.w@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
	"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [RFC 2/3] merge: Add hints to tell users about "git merge --abort"
Date: Wed, 5 Mar 2014 15:51:41 -0500	[thread overview]
Message-ID: <CADgNjamZE5140U2vupgZMKyBq+e22+qOAAWKe=iRk7sxzhonvA@mail.gmail.com> (raw)
In-Reply-To: <xmqqa9d4ijmu.fsf@gitster.dls.corp.google.com>

On Wed, Mar 5, 2014 at 1:29 PM, Junio C Hamano <gitster@pobox.com> wrote:
> If the user said "git merge" while another "git merge" is still
> outstanding, we would want to say "You have not concluded your
> previous merge" and die, and you presumably want to add the same
> "how to abort" message there.  Such a codepath is unlikely to be
> covered by existing advice.resolveConflict, and it sounds more
> natural, at least to me, to use a separate variable to squelch only
> the new "how to abort" part.

Alright, I don't mind using a separate variable. Though I think it'd
be good to keep the variable name slightly more general though, like
"advice.mergeHints", so that we could use the variable to cover other
merge hints in the future as well. Having one advice config/variable
for every single situation seems a bit overkill, and we would end up
with too many variables.

  reply	other threads:[~2014-03-05 20:51 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 [this message]
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
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='CADgNjamZE5140U2vupgZMKyBq+e22+qOAAWKe=iRk7sxzhonvA@mail.gmail.com' \
    --to=andrew.kw.w@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    /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).