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

Re: interactive conflicts

From: Justin Erenkrantz <justin_at_erenkrantz.com>
Date: 2007-07-11 16:29:27 CEST

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.

*smooch* Woo-hoo. Very cool stuff.

Thanks! -- justin

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 11 16:28:59 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.