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

Re: Trouble with merge

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-02-22 08:34:51 CET

Michael Wladarz <mwladarz@computerworks.de> writes:
> 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 !?

I don't know the answer to your question, unfortunately (I also don't
quite understand it -- you might try saying it with more words).
However, your question should go to users@subversion.tigris.org. This
list, dev@subversion.tigris.org, is for Subversion development
discussion.

Thank you and good luck,
-Karl

> 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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Feb 21 23:31:55 2007

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