在本地文件夹添加远端仓库时:
git push 失败 ,提示:
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/nieyu/himalaya.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
根据提示使用
git pull
又提示
fatal: refusing to merge unrelated histories
可以使用
git pull origin master --allow-unrelated-histories
强制拉取不相关代码