Re: how to prevent of an automatic merge

Stefan Küng <tortoisesvn@...> writes:
>
> If you tell me how you do an automatic merge during a commit, I'll
> tell you how to prevent an automatic merge during an update.
>

Aaaahhhh, I fear I will never get an answer. I only thought, that a commit will
do the automatic merge, if there is no conflict reason. (I thought that I've
check this out, but maybe it was in a parallel universe). Ok there is no
automatic merge during a commit. Do you think it's nevertheless possible to get
an answer :-)

---------------------------------------------------------------------
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:59:52 2006