Xcode Git Merge失败 [英] Failed Xcode Git Merge is stuck

问题描述

我们有一个基于git的项目，有一个朋友和一个主分支。他对某些文件进行了一些更改，我对其他一些文件进行了更改，而且我们很可能会对一些相同的文件进行更改。他承诺并将所有更改推向回购。然后，我去做了我的改变，并试图撤消他的改变。我遇到了一些冲突，因为他们是我没有改变的文件，所以我主要解决了这些冲突。然后，当我尝试推送时，我遇到了一个致命错误：在合并期间无法进行部分提交。

We have a git based project with a friend and one master branch. He made some changes to some files, I made changes to some other files, and we may, most probably did, make changes to a couple of the same files. He committed and pushed all of his changes to the repo. Then I went and committed my changes and tried to pull his changes. I was presented with a few conflicts which I mostly resolved in favor of his changes because they were files I did not change. Then when I tried to push, I got a fatal: cannot do a partial commit during a merge.

这些是我得到的屏幕

我该怎么办？该项目运行良好，除了游戏的主菜单没有显示其应该显示的图像，这些是他正在处理的图像和他所处理的类文件，除了一些其他图像。

What can I do? The project runs fine except that the main menu of the game isn't showing the images its supposed to, which are the ones he was working on and the class files he worked on, aside from a couple of other ones.

推荐答案

Xcode与xcuserdata文件存在问题，我不得不放弃更改并重新发送

Xcode has issues with xcuserdata files and I had to discard changes and recommitt

这篇关于Xcode Git Merge失败的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！