You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Cicik <ja...@gmail.com> on 2013/03/19 11:41:19 UTC

TortoiseSVN automerge problem

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

Re: TortoiseSVN automerge problem

Posted by Cicik <ja...@gmail.com>.

someone, any ide pls?
thanks

On Tuesday, March 19, 2013 11:41:19 AM UTC+1, Cicik wrote:
>
> 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
>