Re: Xcode 4.2.1 Git can't commit
Re: Xcode 4.2.1 Git can't commit
- Subject: Re: Xcode 4.2.1 Git can't commit
- From: Marcus Karlsson <email@hidden>
- Date: Sun, 27 Nov 2011 19:25:04 +0100
--On November 27, 2011 6:03:33 AM -0500 Bill Cheeseman
<email@hidden> wrote:
When I remove the old-style Apple Help folder from my project and create
a new-style Apple Help bundle, Git refuses to commit changes because it
can't find the old Help file.
What can I do to resolve this issue? After reading the documentation, I
see that I apparently was supposed to remember to mark the old-style Help
folder as no longer part of the repository and, I guess, keep it in the
project folder at least until committing changes.
It should be enough to do a git rm -r <folder> and then try to commit again.
But it's too late for that now.
No, that's why you use git.
git checkout <commit where the folder existed> -- <path to folder>
(This seems very surprising to me. Shouldn't Git just assume that I
intended to remove a missing item, maybe with a warning? Otherwise, I'm
just stuck, and worried that if I do the wrong thing I'll lose all my
source.)
In general git assumes very little. It detects that the folder has have
been removed, but it doesn't automatically stage the deletion to the index
in order to avoid unintended behavior. Explicit is better than implicit.
Marcus
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden