最新消息:20190717 VPS服务器:Vultr新加坡,WordPress主题:大前端D8,统一介绍入口:关于

[已解决]Xcode中Git提交出错:The working copy failed to commit files. fatal cannot do a partial commit during a merge

Xcode crifan 1540浏览 0评论

Xcode中提交,出错:

The working copy “SalesAppiOS” failed to commit files.

fatal: cannot do a partial commit during a merge.

去看看状态:

licrifandeMacBook-Pro:SalesAppiOS crifan$ git status

On branch master

Your branch and ‘origin/master’ have diverged,

and have 1 and 2 different commits each, respectively.

  (use "git pull" to merge the remote branch into yours)

All conflicts fixed but you are still merging.

  (use "git commit" to conclude merge)

Changes to be committed:

modified:   SalesApp.xcodeproj/project.pbxproj

modified:   SalesApp/AddTaskViewController.swift

modified:   SalesApp/Base.lproj/Main.storyboard

modified:   SalesApp/CustomerDetailViewController.swift

modified:   SalesApp/CustomerViewController.swift

modified:   SalesApp/DatePickerViewController.swift

modified:   SalesApp/FilterCustomerViewController.swift

modified:   SalesApp/GlobalConstants.swift

modified:   SalesApp/GlobalValues.swift

modified:   SalesApp/LabelAndSegmentedControlTableViewCell.swift

modified:   SalesApp/LoginRegisterViewController.swift

modified:   SalesApp/MainViewController.swift

modified:   SalesApp/OptionTableViewCell.swift

modified:   SalesApp/ServerApi.swift

modified:   SalesApp/Task.swift

modified:   SalesApp/TaskTableViewCell.swift

modified:   SalesApp/TaskTypeSelectViewController.swift

modified:   SalesApp/TaskViewController.swift

licrifandeMacBook-Pro:SalesAppiOS crifan$

licrifandeMacBook-Pro:SalesAppiOS crifan$ git pull

error: You have not concluded your merge (MERGE_HEAD exists).

hint: Please, commit your changes before merging.

fatal: Exiting because of unfinished merge.

licrifandeMacBook-Pro:SalesAppiOS crifan$ git commit -m "customer source select ok now"

[master 4416e1b] customer source select ok now

licrifandeMacBook-Pro:SalesAppiOS crifan$ git status

On branch master

Your branch is ahead of ‘origin/master’ by 2 commits.

  (use "git push" to publish your local commits)

nothing to commit, working directory clean

licrifandeMacBook-Pro:SalesAppiOS crifan$

然后再去Xcode中上传,估计就可以了:

回到命令行中直接提交即可

licrifandeMacBook-Pro:SalesAppiOS crifan$ git push

Counting objects: 28, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (28/28), done.

Writing objects: 100% (28/28), 25.84 KiB | 0 bytes/s, done.

Total 28 (delta 18), reused 0 (delta 0)

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

   fb0b5fd..4416e1b  master -> master

licrifandeMacBook-Pro:SalesAppiOS crifan$ git status

On branch master

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

nothing to commit, working directory clean

licrifandeMacBook-Pro:SalesAppiOS crifan$

转载请注明:在路上 » [已解决]Xcode中Git提交出错:The working copy failed to commit files. fatal cannot do a partial commit during a merge

发表我的评论
取消评论

表情

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

  • 昵称 (必填)
  • 邮箱 (必填)
  • 网址
54 queries in 0.093 seconds, using 18.34MB memory