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

interactive conflicts

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-07-06 21:09:39 CEST

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.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 6 21:09:23 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.