Note to self: even if the project icon has a C next to it (meaning, conflict in CVS), do *NOT* under any circumstances, think that Xcode will remove the project file, update it, and thereby resolve the conflict. It just ain’t so..
And because of this shortcoming, I, under my own power — even after having clicked the “Yes, I’m sure box” — blew away a whole days worth of work.
It’s been a long day…
Tweet
