In Xcode 5.0.2, I try to pull from a remote and am given the following message:
"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.
Curious, I run git diff
to see just what has changed. Nothing. git status
provides me with equally helpful output: nothing to commit, working directory clean
. git push
or git pull
? Yep, those work just fine from the command line.
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 some way to push and pull, it would be really nice if the Xcode git integration was behaving nicely. Any ideas?
I've found these similar questions, but none address this particular issue (or provide an acceptable solution):
Okay, so I fixed my issue.
With Xcode open:
git reset --hard
" git status
Restart Xcode and make a commit (Just a comment or something )
Repeat the above steps.
This sorted out my issue for me.
You must fix it with command line git. Go to your working folder in Terminal, type:
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.
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.
After you've done that, go back to Xcode and you should be able to switch branches.
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.
Quick fix:
git add .
git commit -m "Commit"
git push origin master
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With