Thomas Rast <trast@xxxxxxxxxxxxxxx> writes: > Merging in a dirty tree is usually a bad idea because you need to > reset --hard to abort; but the docs didn't say anything about it. Strictly speaking, you do not have to worry about anything if (1) all of your work tree changes are easily reproducible (Linus's keeping a new EXTRAVERSION in his Makefile, never staged nor committed is an often cited example), or (2) you know beforehand that a merge with the other party will not touch the part you have local changes that you care about. In other words, you need to know what you are doing, and a warning with "usually it is a bad idea" would be an appropriate thing to do. -- 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
