Xcode 5 Start to Finish: iOS and OS X Development

Back to User A

This is where User A does his push (Source Control → Push. . . ). And it doesn’t work. An alert sheet slides down to tell him that his copy of the repository, even without his changes, had fallen behind the one he’s trying to push to. (“Behind” in the colloquial sense is a difficult word to apply to a network of developers whose files, as here, are actually newer than the remote repository reflects. In version control, a local copy is behind the remote if the remote has changes that the local hasn’t seen yet.)

He has to pull the remote’s contents into his local set before he can push his own changes. He chooses Source Control → Pull. . . (X); he selects origin/master from the popup (it should be the only choice) and clicks Pull ...