SVN Merge - Client or Server?

Question

When 2 users change the same file (in the same branch) and check their code into SVN, SVN will (after asking the second user to do an update) auto merge the files and try to resolve any conflicts.

Does this merge process happen on the client or on the server?

(more info: I am using Tortoise SVN 1.7.11 on the client, and the server version is 1.5.1, we recently had an auto-merge delete some data and I'm wondering if this is an issue with the code merge in Tortoise or the older server code)

Answer 1

This is a Tortoise SVN thing, and thus on the client. The SVN server will actually kick it back and tell you youre not up to date. Weird that tortoise does that... Doesnt seem like a feature anyone in their right mind would ever want...