Hmmm... One thing I might tell the hypothetical person is to temporarily delete or rename the new version of "somefile", so that the merge could complete with problems, and then recreate or rename it back. That would probably allow the hypothetical person to continue his/her work. --wpd - 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
