konglu@xxxxxxxxxxxxxxx writes: > > Perhaps s/fixed this problem/resolved conflicts/ [...] > > I agree. Still, experienced users probably have their advice.statushints > disabled and won't have any problems resolving a conflict. However, for > "beginners" that need the advices, resolving a conflict may not seem > as trivial as it is. And even though the word "problem" may scare them, > it will attract their attention. But beginners are scared by conflicts. Indeed, "there are conflicts" is automatically translated into "sir, it doesn't work" by many beginners I know ;-). I prefer Junio's wording as a subliminal message that conflicts are not "a problem", but just "something you should avoid when possible, and fix otherwise". -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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