[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Deactivate automatic merge

From: Milen A. Radev <mradev_at_gmail.com>
Date: 2005-11-16 17:01:20 CET

On 16/11/05, Kathrin Bauer <lalelu1982@googlemail.com> wrote:
> Hello,
>
> i want to deactivate the automatic merge in Tortoise as well as in
> Subclipse for the complete repository. After updating, the SVN client
> should generate different files containing the different matters (my
> working copy, the repository version, the version of another user and
> the merged version)
>
> How can I do this?

http://svn.haxx.se/tsvn/archive-2005-10/0253.shtml 

--
Milen A. Radev
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
--
Received on Wed Nov 16 16:08:38 2005

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.