Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> writes: > As an error message that is completely sufficient. > > The advice messages are meant to teach the user about the normal parts > of the toolchest to use in a situation of "conflict", aren't they? Not really. They are to remind (to those who learned but forgot) and to hint (to those who haven't realized they have things to learn in this area). Wall of text that tries to do more than that, like "teaching", risks not getting read by anybody. > Maybe > we should ask someone who hasn't turned them off... Actually, I run without most of the 'advice.*' turned off. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html