From: Matthieu Moy Date: Wed, 09 Jun 2010 20:47:26 GMT Subject: Re: [RFC/ PATCH 5/5] t7609: test merge and checkout error messages Message-ID: In-Reply-To: <1276087446-25112-7-git-send-email-diane.gasselin@ensimag.imag.fr> Diane Gasselin 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/