如何解决GitHub消息,其中显示当前分支的提示位于其远程对应的后面？

Question

我正在努力学习如何使用GitHub来控制我的工作.(我一个人工作,没有合作者,没有不同的分支,只有我在我去的时候备份我的工作.)我在BitBucket.org上建立了私人Git存储库.我使用GitHub for OSX作为我的Git GUI.

但是,当我在我的硬盘驱动器上的本地Git存储库中编辑文件时,然后使用GitHub for OSX尝试"提交和同步",我收到此错误:

git: 'credential-osxkeychain' is not a git command. See 'git --help'.
git: 'credential-osxkeychain' is not a git command. See 'git --help'.
2013-02-12 02:49:07.409 GitHub for Mac Login[44516:707] AskPass with arguments: (
    "/Applications/GitHub.app/Contents/MacOS/GitHub for Mac Login",
    "Password for 'https://username@bitbucket.org': "
)
git: 'credential-osxkeychain' is not a git command. See 'git --help'.
git: 'credential-osxkeychain' is not a git command. See 'git --help'.
To https://username@bitbucket.org/username/data.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://username@bitbucket.org/username/data.git'
hint: Updates were rejected because the tip of your current branch is behind its remote counterpart. Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' in 'git push --help' for details.
 (256)

(我编辑了上面的内容以隐藏我的实际用户名.)

这是什么意思,我该如何解决它,以及如何避免将来获得它？

Answer 1

有人(或您)已更新远程分支.这会导致您的远程分支超越当前分支.(那是你当地的分公司)

我建议你git pull --rebase origin master和push之后.