Sometimes when a multiple-file merge give conflicts, I don't want to edit one of the resulting <<<<<=====>>>>> files. Instead, I just want to choose the version of that particular file that existed in one of the two merged branches and commit that along with the rest of the merge. How to do this? thanks, -Len - 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