You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Michael Wladarz <mw...@computerworks.de> on 2007/02/21 14:58:56 UTC
Trouble with merge
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
Re: Trouble with merge
Posted by Ben Collins-Sussman <su...@red-bean.com>.
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
<mw...@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
Re: Trouble with merge
Posted by Karl Fogel <kf...@red-bean.com>.
Michael Wladarz <mw...@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