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

Preventing Merge on Conflict

From: <chtaylo3_at_vt.edu>
Date: 2006-09-28 23:59:47 CEST

Hello all,

I was wondering if there is a way to prevent svn from attempting to do an
automatic merge when you have an "changed-out of date" conflict? The
developers whould rather manually merge the documents everytime.

Respectfully,
Christopher

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 29 00:01:34 2006

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