Diane Gasselin [off-list ref] writes:
It seems a good idea, I will introduce that in my next version.
Should the message directly advice that files should not be exchanged
outside of Git and propose a solution for resolving the situation?
I don't think the tool should try to guess the origin of the problem,
but give a solution (like "please move or remove the files before you
can merge").
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/