Le 9 juin 2010 22:47, Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> a écrit : > Diane Gasselin <diane.gasselin@xxxxxxxxxxxxxxx> 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/ > 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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html