Re: interactive conflicts

On 7/6/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> If you update your trunk code now, you'll notice that 'svn up' and
> 'svn merge' now do interactive prompting to deal with textual
> conflicts in files. Try it out. It's the result of a week of
> mind-numbing bikeshed discussions.
>
> This new feature can be avoided with --non-interactive, or disabled
> permanently by setting '[miscellany] interactive-conflicts = no' in
> your run-time config file.
>
> The plan is to make our conflict callbacks elegantly deal with
> tree-based conflicts. Soon.

The help for the (a)ccept option has version spelled as verison. I
was going to commit the fix, but I think I saw you say that you are
changing this option to (r)esolved. So I figured you will catch it.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org