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

How do I prevent auto-merge?

From: Karan, Cem \(Civ, ARL/CISD\) <CKaran_at_arl.army.mil>
Date: 2005-04-07 17:26:45 CEST

I've run into an odd problem; I want to prevent files from being auto-merged when updating (when G shows up). Its not that I don't want them to be merged, or that I want them to be treated as binary files; I want subversion to treat all files that would be marked as G to instead be marked as being in conflict, forcing manual analysis of each file. Is it possible to configure the repository/client to force this?

Cem Karan

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 7 17:28:49 2005

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.