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

Re: Disabling automatic conflict resolution?

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-08-17 13:23:03 CEST

james-tigris@jrv.org writes:

> Is there a way to disable automatic conflict resolution, so that all
> conflicts require manual intervention?

You can use diff3-cmd in ~/.subversion/config (or --diff3-cmd from the
command line) to cause Subversion to use an external program rather
than the internal merge. The external program can do whatever you
want it to, including simply saving the three files without attempting
a merge.

Philip Martin
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Aug 17 13:24:27 2003

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

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