gitでのfile cannot be parsedというエラー

Question

soursetreeを使ってcommitpushした後、xcode.projを開こうとしたら以下のエラーが出て開けません。

Project /Applications/MAMP/htdocs/touchtiles2/TouchTiles2/TouchTiles.xcodeproj cannot be opened because the project file cannot be parsed.

大変焦っております。
何かコミットの方法を間違えたのでしょうか？
何か修復する方法はありますか？
よろしくお願いします。

追記：
内容を見てみましたが、恥ずかしながら何がなんだかさっぱりわかりません。どのようにして余計な文字列を見抜けば良いのでしょうか？

// !$*UTF8*$!
{
	archiveVersion = 1;
	classes = {
	};
	objectVersion = 48;
	objects = {

/* Begin PBXBuildFile section */
<<<<<<< HEAD:TouchTiles2/TouchTiles.xcodeproj/project.pbxproj
		3C1A4181206DD0F0001D1566 /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C1A4180206DD0F0001D1566 /* GameKit.framework */; };
		3C1A4183206DD712001D1566 /* GKLocalPlayerUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C1A4182206DD712001D1566 /* GKLocalPlayerUtil.swift */; };
		3C89D9E620734E1E00F314B1 /* GKScoreUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C89D9E520734E1E00F314B1 /* GKScoreUtil.swift */; };
		3C89D9E8207773C600F314B1 /* RankingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C89D9E7207773C500F314B1 /* RankingViewController.swift */; };
		3C89D9EA207F4B4900F314B1 /* TrapRankViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C89D9E9207F4B4900F314B1 /* TrapRankViewController.swift */; };
		3C89D9EC207F4B5F00F314B1 /* EndlessRankViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C89D9EB207F4B5F00F314B1 /* EndlessRankViewController.swift */; };
=======
		5B815F2D699A6400822CC4E0 /* Pods_TouchTiles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2302079C0B7096C88E3A79D /* Pods_TouchTiles.framework */; };
>>>>>>> bffdf4456fd35de635d7b2437d7a1372a5781dcc:TouchTiles/TouchTiles.xcodeproj/project.pbxproj
		F01E319A206A1D3800D3A040 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E3199206A1D3800D3A040 /* AppDelegate.swift */; };
		F01E319C206A1D3800D3A040 /* TopViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E319B206A1D3800D3A040 /* TopViewController.swift */; };
		F01E319F206A1D3800D3A040 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F01E319D206A1D3800D3A040 /* Main.storyboard */; };
		F01E31A2206A1D3800D3A040 /* TouchTiles.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F01E31A0206A1D3800D3A040 /* TouchTiles.xcdatamodeld */; };
		F01E31A4206A1D3800D3A040 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F01E31A3206A1D3800D3A040 /* Assets.xcassets */; };
		F01E31A7206A1D3800D3A040 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F01E31A5206A1D3800D3A040 /* LaunchScreen.storyboard */; };
		F01E31AF206A1D6800D3A040 /* TrapGameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E31AE206A1D6800D3A040 /* TrapGameViewController.swift */; };
		F01E31B1206A223000D3A040 /* TrapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E31B0206A223000D3A040 /* TrapView.swift */; };
		F01E31B3206A23C300D3A040 /* TopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E31B2206A23C300D3A040 /* TopView.swift */; };
		F01E31B5206A36B600D3A040 /* GameTile.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E31B4206A36B600D3A040 /* GameTile.swift */; };
		F01E31B7206A389B00D3A040 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = F01E31B6206A389B00D3A040 /* [e-mail] */; };
		F01E31BA206A38B700D3A040 /* clear.png in Resources */ = {isa = PBXBuildFile; fileRef = F01E31B9206A38B700D3A040 /* clear.png */; };
		F01E31BC206C828600D3A040 /* StandardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E31BB206C828600D3A040 /* StandardView.swift */; };
		F05C66DE206CE15C001C9AA0 /* EndlessViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F05C66DD206CE15C001C9AA0 /* EndlessViewController.swift */; };
		F05C66E0206CE1A4001C9AA0 /* EndlessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F05C66DF206CE1A4001C9AA0 /* EndlessView.swift */; };
		F05C66E2206CE23A001C9AA0 /* StandardGameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F05C66E1206CE23A001C9AA0 /* StandardGameViewController.swift */; };
		F09915BB2080632500BCEE6B /* GameTileStandardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F09915BA2080632500BCEE6B /* GameTileStandardView.swift */; };
		F09915BD2080795E00BCEE6B /* GameTileEndlessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F09915BC2080795E00BCEE6B /* GameTileEndlessView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
<<<<<<< HEAD:TouchTiles2/TouchTiles.xcodeproj/project.pbxproj
		3C1A4180206DD0F0001D1566 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
		3C1A4182206DD712001D1566 /* GKLocalPlayerUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GKLocalPlayerUtil.swift; sourceTree = "<group>"; };
		3C89D9E520734E1E00F314B1 /* GKScoreUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GKScoreUtil.swift; sourceTree = "<group>"; };
		3C89D9E7207773C500F314B1 /* RankingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankingViewController.swift; sourceTree = "<group>"; };
		3C89D9E9207F4B4900F314B1 /* TrapRankViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrapRankViewController.swift; sourceTree = "<group>"; };
		3C89D9EB207F4B5F00F314B1 /* EndlessRankViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndlessRankViewController.swift; sourceTree = "<group>"; };
=======
		A25437658C0E1F772899FD87 /* Pods-TouchTiles.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TouchTiles.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TouchTiles/Pods-TouchTiles.debug.xcconfig"; sourceTree = "<group>"; };
		AC9C8F0B41C40059F6768FCD /* Pods-TouchTiles.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TouchTiles.release.xcconfig"; path = "Pods/Target Support Files/Pods-TouchTiles/Pods-TouchTiles.release.xcconfig"; sourceTree = "<group>"; };
		C2302079C0B7096C88E3A79D /* Pods_TouchTiles.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TouchTiles.framework; sourceTree = BUILT_PRODUCTS_DIR; };
>>>>>>> bffdf4456fd35de635d7b2437d7a1372a5781dcc:TouchTiles/TouchTiles.xcodeproj/project.pbxproj
		F01E3196206A1D3800D3A040 /* TouchTiles.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TouchTiles.app; sourceTree = BUILT_PRODUCTS_DIR; };
		F01E3199206A1D3800D3A040 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
		F01E319B206A1D3800D3A040 /* TopViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopViewController.swift; sourceTree = "<group>"; };
		F01E319E206A1D3800D3A040 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
		F01E31A1206A1D3800D3A040 /* TouchTiles.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TouchTiles.xcdatamodel; sourceTree = "<group>"; };
		F01E31A3206A1D3800D3A040 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
		F01E31A6206A1D3800D3A040 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
		F01E31A8206A1D3800D3A040 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
		F01E31AE206A1D6800D3A040 /* TrapGameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrapGameViewController.swift; sourceTree = "<group>"; };
		F01E31B0206A223000D3A040 /* TrapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrapView.swift; sourceTree = "<group>"; };
		F01E31B2206A23C300D3A040 /* TopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopView.swift; sourceTree = "<group>"; };
		F01E31B4206A36B600D3A040 /* GameTile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameTile.swift; sourceTree = "<group>"; };
		F01E31B6206A389B00D3A040 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
		F01E31B9206A38B700D3A040 /* clear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = clear.png; sourceTree = "<group>"; };
		F01E31BB206C828600D3A040 /* StandardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StandardView.swift; sourceTree = "<group>"; };
		F05C66DD206CE15C001C9AA0 /* EndlessViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndlessViewController.swift; sourceTree = "<group>"; };
		F05C66DF206CE1A4001C9AA0 /* EndlessView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndlessView.swift; sourceTree = "<group>"; };
		F05C66E1206CE23A001C9AA0 /* StandardGameViewController.swift */ = 

以下略
}

Comments

[gouf]

それは、コンフリクトを解消した後のことですか？ 次のリンクの回答にあるような "余計な文字列" が残っていたりしませんか? : https://stackoverflow.com/questions/361799/unable-to-open-project-cannot-be-opened-because-the-project-file-cannot-be-pa

Answer 1

ファイルの中身を見れてるなら、なんとかなりそうですね。
py4s-tnkさんがおっしゃる通り、
コンフリクトしたファイルをそのままコミットしてしまったのでしょう。

ファイルの中身にあります、

<<<<<<< HEAD:TouchTiles2/TouchTiles.xcodeproj/project.pbxproj

から、直近の

=======

までの箇所が、ローカル側、
（HEAD:とついてるのがローカル側ってことです）

>>>>>>> bffdf4456fd35de635d7b2437d7a1372a5781dcc:TouchTiles/TouchTiles.xcodeproj/project.pbxproj

から、直近の

=======

までの箇所が、リモート上の、ローカルとコンフリクトしている箇所になります。

複数箇所存在しているようなので、
1箇所ずつ優先する方を決め、
使わない行を削除してください。

また、その際、

<<<<<<< HEAD:TouchTiles2/TouchTiles.xcodeproj/project.pbxproj

や、

=======

などの、コンフリクト箇所を表してる文字も全て削除するのを忘れずに。

あと、複数人でバージョン管理されている場合は、他の方とも、どこを優先するか相談することも忘れずにやっていきましょう。
まずは、慌てず落ち着いて。

Comments

[aaaaaachannel]

なんとか解消できました。ありがとうございました。

Answer 2

おそらくコンフリクトしたファイルをコミットしてしまったのでしょう。
だから、xcode.projというファイルが解析できないとエラーが出ています。
xcode.projというファイルを開いて、コンフリクトを解消してください。