For conflicting binary files, I suggest you use "resolve later" and then after the merge resolve the conflict manually. Because the other "resolve" options assume text files and don't properly work with binary files.
-- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/7b77a36f-f844-46c6-a74e-db4de1eb35a7%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
