[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 05:47:00 CEST

james-tigris@jrv.org writes:

> Is there a way to disable automatic conflict resolution, so that all
> conflicts require manual intervention?
>
> I am looking into revision control systems for a company, and they
> would rather never have Subversion resolve any conflict but that have
> the user do this.
>
> If there's no option for this, is there a place in the source code
> where I can easily force all attempts at automatic conflict resolution
> to fail?

Subversion has no automatic conflict resolution. If changes received
during an update or switch conflict with local modifications,
Subversion will leave conflict markers in the working file, the file
will be noted in the working copy metadata as being in a state of
conflict, and the user will have to resolve the conflict and/or inform
Subversion that the conflict was manually resolved before that file is
eligible for commit again.

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

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