[Adium-devl] Problem opening the xcode project file

[Peter Hosey]

On Nov 23, 2006, at 08:23:34, Chris Stewart wrote:
> "Unable to Open Project
>
> Project /xyz/Adium.xcodeproj cannot be opened because the project  
> file cannot be parsed."

You probably have conflicts. You can check with the command:

	svn st Adium.xcodeproj/project.pbxproj

If this is the case (“C      Adium.xcodeproj/project.pbxproj”), edit  
the pbxproj file in your favorite editor and look for conflict marks:

<<<<<<< .r42
	[sandwichMaker makeUglySandwich];
=======
	[sandwichMaker makeTastySandwich];
 >>>>>>> .mine

Resolve the conflicts according to your superior human judgment, then  
issue the command:

	svn resolved Adium.xcodeproj/project.pbxproj
________________________________
\ Peter Hosey / prh at boredzo.org
PGP public key ID: 7AB26BAD (since 2006-01-01)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20061123/b753f4aa/attachment.sig>