Blank Chen says to Happy Web Developer https://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-conflicts.html