[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: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-02-21 17:22:34 CET

Please send you mail to users@subversion.tigris.org, this list is for
discussion of subversion's own development.

On 21 Feb 2007 15:58:56 +0100, Michael Wladarz
<mwladarz@computerworks.de> wrote:
> 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
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Feb 21 17:22:51 2007

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