title: SVN merge just overwrites all files
body: <p>When i try to merge from branch to trunk using SVNTortoise, it just overwrites everything with branch copy, doesn't ask me to resolve any conflicts. Does anybody know why? "Merge non-interactive" checkbox is not checked.</p>