how to prevent of an automatic merge

Hi all,

I want to do all merging action by hand. Is it possible to configure subversion
or tortoise in that way, that an update will not automatically merge, but give
the information that there is something to merge? The same for a commit. If I
do the commit action I don't want subversion to do the automatic merge. I wanna
do this manually.

Thanks
Linton

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue May 9 09:10:16 2006