Taylor Blau <me@xxxxxxxxxxxx> 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.
