From: Junio C Hamano <gitster@pobox.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: "Felipe Contreras" <felipe.contreras@gmail.com>,
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: Thu, 09 Mar 2023 15:44:53 -0800 [thread overview]
Message-ID: <xmqqv8j97ami.fsf@gitster.g> (raw)
In-Reply-To: ZAix68A9e6RHz69y@nand.local
Taylor Blau <me@ttaylorr.com> writes:
> 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.
We may want to further tweak the advise() message depending on the
caller [*], but that can come on top after these two patches settle.
[Footnote]
* When a failed "git pull" gave the new advise() message, the user
may not be advanced enough to adjust the advice to run "git merge
--no-ff" to the given situation, for example.
prev parent reply other threads:[~2023-03-09 23:45 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 ` [PATCH 0/2] advice: add diverging advice Taylor Blau
2023-03-08 17:17 ` Junio C Hamano
2023-03-09 23:44 ` Junio C Hamano [this message]
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=xmqqv8j97ami.fsf@gitster.g \
--to=gitster@pobox.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=me@ttaylorr.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.