Hello Everyone, I have a binary file that is coming up with a merge conflict (obviously) between two branches and I want to simply say, 'take their version of the file'. Is this possible? In subversion it's a pretty trivial merge operation, so I assume there's something similar in git. Thanks in advance! -- In Christ, Timmy V. http://burningones.com/ http://five.sentenc.es/ - Spend less time on e-mail -- 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
