xcode 本地存储库已过期。确保已从远程存储库中提取所有更改，然后重试
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/43459369/
Warning: these are provided under cc-by-sa 4.0 license. You are free to use/share it, But you must attribute it to the original authors (not me):
StackOverFlow
The local repository is out of date. Make sure all changes have been pulled from the remote repository and try again
提问by Toma Radu-Petrescu
I am new to Git and I am trying to merge my branch (With_Base_Class) with the remote master branch from within Xcode.
我是 Git 的新手，我正在尝试将我的分支 ( With_Base_Class) 与 Xcode 中的远程主分支合并。
I tried commiting and pulling in every possible order (I hope), but every time I recieve the following error:
我尝试提交并执行所有可能的顺序（我希望如此），但每次我收到以下错误：
The local repository is out of date.
Make sure all changes have been pulled from the remote repository and try again.
This is a video of me getting the error:
这是我收到错误的视频：
What am I doing wrong?
我究竟做错了什么？
Any help is appreciated.
任何帮助表示赞赏。
Thanks!
谢谢！
回答by harish sami
Try this git command
试试这个 git 命令
git push origin master --force
git push origin master --force
回答by KinneyKare
I just had this same issue and it ended up being a weird disconnect between Xcode and GitHub. How I fixed this was going to GitHuB and changing my password. Then authenticating again in Xcode using the new password. WORKED LIKE A CHARM!!!
我刚刚遇到了同样的问题，最终导致 Xcode 和 GitHub 之间出现了奇怪的脱节。我如何解决这个问题是去 GitHub 并更改我的密码。然后使用新密码在 Xcode 中再次进行身份验证。像魅力一样工作！！！
