Matthieu Moy 4c371f9127 merge-recursive: point the user to commit when file would be overwritten. ...

The commit-before-pull is well accepted in the DVCS community, but is
confusing some new users. This should get them back in the right way when
the problem occurs.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2009-11-22 16:07:27 -08:00

236 B

Raw Blame History

View Raw