Subject: Re: [RFC/ PATCH 5/5] t7609: test merge and checkout error messages

From: Matthieu Moy <[email-masked]>
Date: Wed, 09 Jun 2010 22:47:26 +0200

Diane Gasselin <[email-masked]> writes:

> +error: Untracked working tree files:
> +	five
> +would be overwritten by merge.
> +EOF

In my experience, newbies are often confused by this message (typical
example is students who don't believe me when I tell them not to
exchange files by email, getting untracked files from their co-workers
outside Git, and then trying to pull).

Perhaps this deserves an advice like the one we have for modified
files:

> +error: Your local changes to the files:
> +	two
> +	three
> +	four
> +would be overwritten by merge.
> +Please, commit your changes or stash them before you can merge.

(also disabled by advice.commitBeforeMerge)

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/