Xcode：“工作副本 ____ 有未提交的更改”与 git 状态：“无需提交，工作目录干净”

Xcode: "The working copy ____ has uncommitted changes" vs. git status: "nothing to commit, working directory clean"

提问by GarlicFries

In Xcode 5.0.2, I try to pull from a remote and am given the following message:

在 Xcode 5.0.2 中，我尝试从远程拉取并收到以下消息：

"The working copy 'project-name' has uncommitted changes. Commit or discard the changes and try again."

“工作副本‘项目名称’有未提交的更改。提交或放弃更改，然后重试。”

Fair enough. I pull up the commit dialog, and am then given the message, "This file does not exist at the requested revision." Clicking 'OK' brings me on into the commit dialog. (There is no revision displayed in the right pane, presumably for the same reason I was given the most recent message.) Selecting the flat view, I see that there is only one modified file: project.pbxproj. I enter a commit message and click 'Commit 1 File'. When I then go to pull, I find that I am in exactly the same position as before--the same messages appear and I am unable to pull (or push) no matter how many times I make a commit.

很公平。我打开提交对话框，然后收到消息，“此文件在请求的修订版中不存在。” 单击“确定”使我进入提交对话框。（右窗格中没有显示修订，大概是因为我收到最新消息的原因。）选择平面视图，我看到只有一个修改过的文件：project.pbxproj. 我输入提交消息并单击“提交 1 个文件”。然后当我去拉时，我发现我和以前的位置完全一样——出现相同的消息，无论我提交多少次，我都无法拉（或推）。

Curious, I run git diffto see justwhat has changed. Nothing. git statusprovides me with equally helpful output: nothing to commit, working directory clean. git pushor git pull? Yep, those work just fine from the command line.

出于好奇，我跑去git diff看看发生了什么变化。没有。git status为我提供了同样有用的输出：nothing to commit, working directory clean. git push或者git pull？是的，这些在命令行中工作得很好。

So what gives? Why does Xcode insist that I have changes in my working directory? Why won't it tell me what they are? Have tried restarting Xcode and system. While I'm happy that I still have someway to push and pull, it would be really nice if the Xcode git integration was behaving nicely. Any ideas?

那么什么给呢？为什么 Xcode 坚持我的工作目录有更改？为什么它不告诉我它们是什么？已尝试重新启动 Xcode 和系统。虽然我很高兴我仍然有一些推和拉的方法，但如果 Xcode git 集成表现良好，那就太好了。有任何想法吗？

I've found these similar questions, but none address this particular issue (or provide an acceptable solution):

我发现了这些类似的问题，但没有一个解决这个特定问题（或提供可接受的解决方案）：

• Cannot push, pull or merge git. "Working copy has uncommited changes"
• Commit or discard the changes and try again
• Git pull fails: You have unstaged changes. Git status: nothing to commit (working directory clean)
• Xcode Version Controll GIT - has uncommitted changes, just after commit
• Xcode says "Uncommitted Changes" Whenever I try to git pull or push

• 不能推、拉或合并 git。“工作副本有未提交的更改”
• 提交或放弃更改并重试
• Git pull 失败：您有未暂存的更改。Git 状态：无需提交（工作目录干净）
• Xcode 版本控制 GIT - 在提交后有未提交的更改
• 每当我尝试 git pull 或 push 时，Xcode 都会说“未提交的更改”

回答by Robert J. Clegg

Okay, so I fixed my issue.

好的，所以我解决了我的问题。

With Xcode open:

打开 Xcode：

1. Open terminal - cd / to your project directory.
2. Type in: "git reset --hard"
3. Type in git status

1. 打开终端 - cd / 到您的项目目录。
2. 输入：“ git reset --hard”
3. 输入 git status

Restart Xcode and make a commit (Just a comment or something )

重新启动 Xcode 并进行提交（只是评论或其他内容）

Repeat the above steps.

重复以上步骤。

This sorted out my issue for me.

这为我解决了我的问题。

回答by Matt H

You must fix it with command line git. Go to your working folder in Terminal, type:

您必须使用命令行 git 修复它。转到终端中的工作文件夹，键入：

git status

That will show you what files have uncommitted changes. Crashlytics, for instance, will update itself as soon as you run it, and even using Xcode/Source Control/Discard Changes won't get rid of it.

这将显示哪些文件具有未提交的更改。例如，一旦您运行 Crashlytics，它就会自动更新，即使使用 Xcode/Source Control/Discard Changes 也无法摆脱它。

Once you see the files that have uncommitted changes (ignore added files), use:

一旦您看到具有未提交更改的文件（忽略添加的文件），请使用：

git checkout -- Folder/filename.ext

That's the same as a "discard" in Xcode.

这与 Xcode 中的“丢弃”相同。

After you've done that, go back to Xcode and you should be able to switch branches.

完成后，返回 Xcode，您应该能够切换分支。

回答by Tr0yJ

App Code solution:

应用代码解决方案：

1. Confirm git status in Terminal:

   git status

2. Open 'yourProject.xcworkspace' in App Code

3. VCS > Git > Branches...

4. Remote Branches > yourBranch > Checkout as new local branch

5. Confirm fix via Terminal:

   git status

1. 在终端中确认 git 状态：

   状态

2. 在应用程序代码中打开“yourProject.xcworkspace”

3. VCS > Git > 分支...

4. 远程分支 > yourBranch > Checkout 作为新的本地分支

5. 通过终端确认修复：

   状态

回答by J. Doe

xCode is really-really crappy. Everytime you just look at files, a file called UserInterfaceState.xcuserstate is changed. You don't see it in the overview of xCode itself, through the command line you can.

xCode 真的非常糟糕。每次只查看文件时，都会更改名为 UserInterfaceState.xcuserstate 的文件。您在 xCode 本身的概述中看不到它，通过命令行可以。

Quick fix:

快速解决：

1. Open Terminal
2. CD to your project directory, and type the following:
3. git add .
4. git commit -m "Commit"
5. git push origin master

1. 打开终端
2. CD 到您的项目目录，然后键入以下内容：
3. git add .
4. git commit -m "Commit"
5. git push origin master