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

TortoiseSVN automerge problem

From: Cicik <jarozubak_at_gmail.com>
Date: Tue, 19 Mar 2013 03:41:19 -0700 (PDT)

Hi,
in my company we are using TortoiseSVN with automatic merges turned off
this way( http://tortoisesvn.tigris.org/faq.html#noautomerge ). But when I
am merging range of revision(feature branch), Tortoise do automatic merges,
despite my setting. During Update automatic merge correctly fails as I
expected.
Tortoise version, merge tool setup, diff tool setup and config are in
attachement.
Please help me.
Thanks

diff_tool.PNG merge_tool.PNG tortoise_version.PNG
Received on 2013-03-19 11:42:01 CET

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

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