ios - 无法推送、 pull 或 merge git。 "Working copy has uncommited changes"

Question

我最近在 bitbucket 上建立了一个 git 存储库，并在其中添加了一个旧项目。我已经提交并推送了一个更改作为测试，但现在我遇到了这个问题。

每次我尝试 pull 、推送或 merge 时，我都会收到此错误消息:

“工作副本‘Project_Name’有未提交的更改”。

我已经多次提交此更改:

---

编辑:我做了“git status”并得到了以下信息:

# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#   modified:   Crunch.xcodeproj/project.xcworkspace/xcuserdata/Neil.xcuserdatad/UserInterfaceState.xcuserstate
#
no changes added to commit (use "git add" and/or "git commit -a")

---

SirKaydian 将不胜感激

Answer 1

第一步:

git rm --cached ProjectName.xcodeproj/project.xcworkspace/xcuserdata/username.xcuserdatad/UserInterfaceState.xcuserstate

第 2 步:

git commit -m "Removed file that shouldn't be tracked"