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

Re: Disable auto merge

From: Milen A. Radev <milen_at_radev.net>
Date: Fri, 12 Mar 2010 12:30:46 +0200

2010/3/12 Huszti András <Andras.Huszti_at_knorr-bremse.com>:
> Hello!
>
> Does it make any sense to request a feature what enables to turn off auto mergeing feature?
>
> Sometimes it would be better to do an update where auto mergeing is turned off, and clearing all conflicts by hand.
>

http://tortoisesvn.tigris.org/faq.html#noautomerge

-- 
Milen A. Radev
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2458599
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-12 11:30:58 CET

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