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

How to turn off "Merge non-interactive"

From: Tim <NovasTaylor_at_gmail.com>
Date: Wed, 1 Feb 2012 08:20:50 -0800 (PST)

Hi Folks,

How do I uncheck the box "Merge non-interactive" in the merge window to get back to interactive merging? I checked the box once and now it is always checked. I want to switch back to interactive merging. If I uncheck the box while a merge is occurring it continues to be non-interactive for that current merge and all future ones (the box is once again checked for the next merge I perform).

In the config file I also changed the option to:

interactive-conflicts = yes

with no effect.

TSVN 1.6.10 Build 19898

Thanks for any help you may be able to provide!



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-02-01 17:20:51 CET

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.