Re: [RFC PATCH 05/35] fast-forward: add advice for novices

> > --- a/builtin/merge.c
> > +++ b/builtin/merge.c
> > @@ -1625,8 +1625,10 @@ static int merge_common(int argc, const char **argv, const char *prefix,
> >  		}
> >  	}
> >  
> > -	if (fast_forward == FF_ONLY)
> > +	if (fast_forward == FF_ONLY) {
> > +		diverging_advice();
> >  		die(_("unable to fast-forward"));
> > +	}
> >  
> >  	if (autostash)
> >  		create_autostash(the_repository,
> 
> ...ah, and re my comment on the earlier patch here's where we're adding
> advice.
> 
> I'd think just squash that into this, or mention in the commit message
> "a later commit will add an advice() before this, where this new wording
> will make more sense" or something...