[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: <cmpilato_at_collab.net>
Date: 2003-08-17 15:56:56 CEST

Philip Martin <philip@codematters.co.uk> writes:

> 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 gets the Bright Idea award.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Aug 17 15:59:59 2003

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