Disabling automatic conflict resolution?

Is there a way to disable automatic conflict resolution, so that all
conflicts require manual intervention?

I am looking into revision control systems for a company, and they
would rather never have Subversion resolve any conflict but that have
the user do this.

If there's no option for this, is there a place in the source code
where I can easily force all attempts at automatic conflict resolution
to fail?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Aug 17 05:42:36 2003