[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-08-17 07:45:12 CEST

kfogel@collab.net writes:

> cmpilato@collab.net writes:
> > 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.
>
> I think James means automatic merging. And we don't have any option
> to disable automatic merging.

Sure we do. Set the svn:mime-type property on every file to something
non-texty.

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

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