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

Fwd: Trouble with merge

From: Michael Wladarz <mwladarz_at_computerworks.de>
Date: 2007-02-22 07:54:48 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 !?

Thanks,
Michael

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 22 14:30:48 2007

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.