Re: how to prevent of an automatic merge

On 5/9/06, Linton Carver <lintonkwesi@gmx.de> wrote:

> 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.

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.

Stefan

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org