Merging files

I am evaluating subversion and am tring to understand one feature. I
understand that when 2 different users checkout a file and both make
changes, then subversion will merge these by default. I understand that the
changes are committed to the repository, and only flag a conflict if changes
have been made by both users in the same line of the file.

However, in my situation, I would never want merging of files to occur. I
would always want a conflict to be flagged.

Is this possible in Subversion? If so:

1. how do I configure it for this?
2. Can one repository on a server be configured for merging to be on, and
another for it to be off?

Thanks

John

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Dec 16 06:07:31 2004