From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Wed, 09 Jun 2010 21:31:02 GMT
Subject: Re: [RFC/ PATCH 5/5] t7609: test merge and checkout error messages
Message-ID: <vpqsk4vrizt.fsf@bauges.imag.fr>
In-Reply-To: <AANLkTinw5gC9jCqhEeufwVnK0rZ-bJdx9sgpwEPoBEAw@mail.gmail.com>

Diane Gasselin <diane.gasselin@ensimag.imag.fr> 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/