最新消息:VPS服务器又从fzhost.net换回Linode了,主题仍用朋友推荐的大前端D8

[已解决]Xcode冲突:xcodeproj could’t load project project.pbxproj conflict

Xcode crifan 794浏览 0评论

[问题]

licrifandeMacBook-Pro:SalesAppiOS crifan$ git stash

Saved working directory and index state WIP on master: 316bb1d 1. optimize login and register process 2. can login now 3. optimize swift notice lib 4. add http to CrifanLib

HEAD is now at 316bb1d 1. optimize login and register process

licrifandeMacBook-Pro:SalesAppiOS crifan$ git pull

remote: Counting objects: 46, done.

remote: Compressing objects: 100% (46/46), done.

remote: Total 46 (delta 25), reused 0 (delta 0)

Unpacking objects: 100% (46/46), done.

From http://git.oschina.net/QorosSalesApp/SalesAppiOS

   316bb1d..4a4d7db  master     -> origin/master

Updating 316bb1d..4a4d7db

Fast-forward

SalesApp.xcodeproj/project.pbxproj                                               |   24 +

SalesApp/AddCustomerViewController.swift                                         | 1537 ++++++++++++++++++++++++++————

SalesApp/Assets.xcassets/Customer/important_star.imageset/Contents.json

………………………………………………………………………………

………………………………………………………………………………

licrifandeMacBook-Pro:SalesAppiOS crifan$ git stash pop

Auto-merging SalesApp.xcodeproj/project.pbxproj

CONFLICT (content): Merge conflict in SalesApp.xcodeproj/project.pbxproj

结果再去打开项目,就打不开了:

                980C2ED91CF295A300BAE3F9 /* MainViewController.swift in Sources */,

<<<<<<< Updated upstream

                E5FEC3141D057DB20058EAA6 /* CustomerTableViewHeadView.swift in Sources */,

=======

                989C198F1D0557E3003B4425 /* YoshikoTextField.swift in Sources */,

>>>>>>> Stashed changes

                E5DAC94A1D012DC6006F44AE /* MessageTableViewCell.swift in Sources */,

改为:

                980C2ED91CF295A300BAE3F9 /* MainViewController.swift in Sources */,

                E5FEC3141D057DB20058EAA6 /* CustomerTableViewHeadView.swift in Sources */,

                989C198F1D0557E3003B4425 /* YoshikoTextField.swift in Sources */,

                E5DAC94A1D012DC6006F44AE /* MessageTableViewCell.swift in Sources */,

SalesApp.xcodeproj/project.pbxproj: warning: Merge conflict: File still marked as conflicted

去git add对应文件:

licrifandeMacBook-Pro:SalesAppiOS crifan$ git status

On branch master

Your branch is up-to-date with ‘origin/master’.

Changes to be committed:

  (use "git reset HEAD <file>…" to unstage)

new file:   SalesApp/AkiraTextField.swift

modified:   SalesApp/Base.lproj/LaunchScreen.storyboard

modified:   SalesApp/CommonTextFiled.swift

modified:   SalesApp/CrifanLib.swift

modified:   SalesApp/CrifanLibDemo.swift

modified:   SalesApp/CrifanLibHttp.swift

new file:   SalesApp/CrifanLibHttpDemo.swift

modified:   SalesApp/GesturePasswordViewController.swift

modified:   SalesApp/GlobalConstants.swift

new file:   SalesApp/HoshiTextField.swift

new file:   SalesApp/IsaoTextField.swift

new file:   SalesApp/JiroTextField.swift

new file:   SalesApp/KaedeTextField.swift

modified:   SalesApp/LoginRegisterViewController.swift

modified:   SalesApp/LoginView.swift

new file:   SalesApp/MadokaTextField.swift

new file:   SalesApp/MinoruTextField.swift

modified:   SalesApp/RegisterView.swift

new file:   SalesApp/TextFieldEffects.h

new file:   SalesApp/TextFieldsEffects.swift

new file:   SalesApp/YokoTextField.swift

new file:   SalesApp/YoshikoTextField.swift

Unmerged paths:

  (use "git reset HEAD <file>…" to unstage)

  (use "git add <file>…" to mark resolution)

both modified:   SalesApp.xcodeproj/project.pbxproj

licrifandeMacBook-Pro:SalesAppiOS crifan$ git add SalesApp.xcodeproj/project.pbxproj

licrifandeMacBook-Pro:SalesAppiOS crifan$ git status

On branch master

Your branch is up-to-date with ‘origin/master’.

Changes to be committed:

  (use "git reset HEAD <file>…" to unstage)

modified:   SalesApp.xcodeproj/project.pbxproj

new file:   SalesApp/AkiraTextField.swift

modified:   SalesApp/Base.lproj/LaunchScreen.storyboard

modified:   SalesApp/CommonTextFiled.swift

modified:   SalesApp/CrifanLib.swift

modified:   SalesApp/CrifanLibDemo.swift

modified:   SalesApp/CrifanLibHttp.swift

new file:   SalesApp/CrifanLibHttpDemo.swift

modified:   SalesApp/GesturePasswordViewController.swift

modified:   SalesApp/GlobalConstants.swift

new file:   SalesApp/HoshiTextField.swift

new file:   SalesApp/IsaoTextField.swift

new file:   SalesApp/JiroTextField.swift

new file:   SalesApp/KaedeTextField.swift

modified:   SalesApp/LoginRegisterViewController.swift

modified:   SalesApp/LoginView.swift

new file:   SalesApp/MadokaTextField.swift

new file:   SalesApp/MinoruTextField.swift

modified:   SalesApp/RegisterView.swift

new file:   SalesApp/TextFieldEffects.h

new file:   SalesApp/TextFieldsEffects.swift

new file:   SalesApp/YokoTextField.swift

new file:   SalesApp/YoshikoTextField.swift

licrifandeMacBook-Pro:SalesAppiOS crifan$

即可。

转载请注明:在路上 » [已解决]Xcode冲突:xcodeproj could’t load project project.pbxproj conflict

发表我的评论
取消评论

表情

Hi,您需要填写昵称和邮箱!

  • 昵称 (必填)
  • 邮箱 (必填)
  • 网址
15 queries in 0.226 seconds, using 10.32MB memory