Tortoise Svn Merge

Hi,

I'm working on a bigger project that still uses subversion for sharing/storing data. Everything seems fine in day to day use. But during merge i get really huge amount of tree conflicts, that are produced only with Bitdefender Total Security enabled. Is there any remedy for this?

Thanks Ondra

Comments