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

Re: How to turn off "Merge non-interactive"

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 01 Feb 2012 18:38:22 +0100

On 01.02.2012 17:20, Tim wrote:
> 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).

That shouldn't happen: if you click on the checkbox, the state is
immediately changed.
If it doesn't work for you: remove the registry key


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-02-01 18:38:32 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.