Re: interactive conflict resolution: on by default?

On 9/27/07, Jack Repenning <jrepenning@collab.net> wrote:
> Grubbing the list history, it appears to me that Ben advocated having
> interactive conflict resolution "off" by default. Some people
> thought that was wrong (heck, someone disagrees with everything!),
> but the last positive statement I can find says it'll default off.
>
> But, of course, in my less-than-24-hours-old trunk/HEAD build, it's
> "on" by default.
>
> What's the plan? I'm not particularly voting either way at the
> moment, just wondering if this question has jelled.

This is one of the few that is in the draft release notes:

http://subversion.tigris.org/svn_1.5_releasenotes.html#conflict-resolution

On by default with a global option to turn off. And of course
--non-interactive on the CLI turns it off for that command.

-- 
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