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

Re: TortoiseSVN automerge problem

From: Cicik <jarozubak_at_gmail.com>
Date: Wed, 17 Apr 2013 01:30:49 -0700 (PDT)

someone, any ide pls?

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
Received on 2013-04-17 10:31:28 CEST

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.