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

This is why automated (unit) testing is a fundamental part of distributed software development. In the example you give, at least one unit test should fail on svn update and alert you to the error.

Remember what Subversion is: a version control system, not a perfectly-working-code-merging-tool.