Can I turn off automatic merging in Subversion?

Question

We\'re looking at moving from a check-out/edit/check-in style of version control system to Subversion, and during the evaluation we discovered that when you perform an Update ac

Answer 1

Here is a trick for TortoiseSVN:

How to turn off “auto-merge” in Subversion

Trick for svn.exe is to set svn external diff tool to a program that will constantly fail.

svn --diff-cmd=/bin/false

If external diff program fails, svn concludes that conflict is unresolvable and wouldn't merge it.