All of lore.kernel.org
 help / color / mirror / Atom feed
From: Taylor Blau <me@ttaylorr.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, "Alex Henrie" <alexhenrie24@gmail.com>,
	"Heba Waly" <heba.waly@gmail.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
	"Matheus Tavares" <matheus.tavb@gmail.com>
Subject: Re: [PATCH 0/2] advice: add diverging advice
Date: Wed, 8 Mar 2023 11:03:55 -0500	[thread overview]
Message-ID: <ZAix68A9e6RHz69y@nand.local> (raw)
In-Reply-To: <20230308024834.1562386-1-felipe.contreras@gmail.com>

Hi Felipe,

On Tue, Mar 07, 2023 at 08:48:32PM -0600, Felipe Contreras wrote:
> Not all our users are experts in git who understand their configurations
> perfectly, some might be stuck in a simple error:
>
>   Not possible to fast-forward, aborting.
>
> That's not very friendly.
>
> Let's add a bit more advice in case the user doesn't know what's going
> on.

Thanks for improving this case. I think the new advice() is reasonable
and will be helpful for users who might otherwise get stuck here.

I don't think that splitting it into two separate patches was strictly
necessary. If I were queuing, I'd probably squash the two together, but
I leave that one to Junio to figure out ;-).

Thanks,
Taylor

  parent reply	other threads:[~2023-03-08 16:05 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-08  2:48 [PATCH 0/2] advice: add diverging advice Felipe Contreras
2023-03-08  2:48 ` [PATCH 1/2] advice: add diverging advice for novices Felipe Contreras
2023-03-08 17:17   ` Junio C Hamano
2023-03-08  2:48 ` [PATCH 2/2] advice: make diverging advice configurable Felipe Contreras
2023-03-08 16:03 ` Taylor Blau [this message]
2023-03-08 17:17   ` [PATCH 0/2] advice: add diverging advice Junio C Hamano
2023-03-09 23:44   ` Junio C Hamano

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

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

  git send-email \
    --in-reply-to=ZAix68A9e6RHz69y@nand.local \
    --to=me@ttaylorr.com \
    --cc=alexhenrie24@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=heba.waly@gmail.com \
    --cc=matheus.tavb@gmail.com \
    --cc=pclouds@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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.