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

Trouble with merge

From: Michael Wladarz <mwladarz_at_computerworks.de>
Date: 2007-02-21 15:58:56 CET

Hi,

we have some trouble with the merge order.
We worked with xcode and if svn try to merge the xcode project files *.mode2, *.pbxproj2, *.perspective natural are in confict!
Is there any way to debar this project files !?

-- 
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
ComputerWorks GmbH
Schwarzwaldstrasse 67
79539 Loerrach/GERMANY
Fon +49 - 76 21 / 40 180
Fax +49 - 76 21 / 40 18 18
Email: mwladarz@computerworks.de
http://www.computerworks.de
Distributor für Deutschland, Schweiz und Österreich
VectorWorks - Cinema 4D - SketchUp - Piranesi - FastTrack Schedule - LoopsFinanz - NisusWriter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Feb 21 15:59:27 2007

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