How do I merge a branch X into my master and tell git that whenever there is a conflict, the file on X should prevail? This is for a scripted application. Cheers, Geoff -- 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