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

Disable automatic merge

From: Cédric Girard <cedric.girard_at_jouy.inra.fr>
Date: 2005-03-01 20:15:13 CET

Hi,

I work with Borland Delphi, tortoiseSVN 1.1.2 and subversion 1.0.1
server under linux.
We often have problems with automatic merge of DFM files (textfile
containing gui description). I want to disable automatic merge, I want
to do all merge by hand.

What can I do?

Thanks in advance
Cédric 

-- 
Cédric GIRARD
BRACER Biotech (INRA)
Bât. 232 - Physiologie Animale
Domaine de Vilvert
78352 JOUY EN JOSAS CEDEX
Tel: 01 34 65 23 29
Fax: 01 34 65 23 60
email: cedric.girard@bracer-biotech.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 2 16:53:16 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.