I often see my students confused after a failed merge and they can't figure out what to do next. Two typical error messages they get are [1]% git merge master Auto-merging cool CONFLICT (content): Merge conflict in cool Automatic merge failed; fix conflicts and then commit the result. [2]% git merge feature error: Entry 'cool' not uptodate. Cannot merge. fatal: merging of trees 8ec1d96451ff05451720e4e8968812c46b35e5e4 and aad8d5cef3915ab78b3227abaaac99b62db9eb54 failed In the former case, the merge command gives a helpful message that automatic merge failed because it found a conflict and tells enough instruction to the user. But in the latter case, the messages look unnecessarily scary, with two "error" and "fatal" comments, and long sha1 commit names. Those of us who used git for some time can tell what it wants to say. The merge checked the files in the working tree before doing anything, found that the user has uncommitted change to a file that is involved in the merge, and it stopped. And it didn't change anything. It may be "fatal" but the user has much less reason to be scared about this failure than the conflicting case. It would be nice if the message in the latter case can be toned down. -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ -- 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