Re: [PATCHv7 1/4] wt-status.*: better advices for git status added

konglu@minatec.inpg.fr writes:

quoted

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/