1、fatal: cannot lock ref 'HEAD'：解決方法重新創(chuàng)建Head

echo ref: refs/heads/master >.git/HEAD

2、Updates were rejected because the tip of your current branch is behind

git fetch origin master

git commit?

git merge origin/master

git push

3、master -> master (non-fast-forward)

可以通過(guò)如下命令進(jìn)行代碼合并【注：pull=fetch+merge]

git pull --rebase origin master

此時(shí)再執(zhí)行語(yǔ)句 git push -u origin master即可完成代碼上傳到github

http://jingyan.baidu.com/article/f3e34a12a25bc8f5ea65354a.html

http://www.itdecent.cn/p/835e0a48c825