Re: Non-interactive merge option?

Rick Yorgason wrote:
> Hey guys,
>
> I'm using beta1, and I'm just wondering if there's any sort of
> non-interactive option for merging, like there is in the command-line
> client.

When the conflict resolution dialog pops up the first time, you can
chose to leave all future conflicts. From that time on, the merge will
go on and not bother you again.

> It's kind of frustrating to start a merge, go for a tea, and come back
> to find that it's only merged two files!

I've added a check box in r12733 to force the merge to be non-interactive.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net