遇到问题： git push origin master
! [rejected] master -> master (non-fast-forward) error: failed to push some refs to ‘ ‘ To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. ‘git pull’) before pushing again. See the ‘Note about fast-forwards’ section of ‘git push –help’ for details.
解决方法，先把git的东西fetch到本地，然后merge后再push $ git fetch origin master $ git merge origin master $ git push origin master
或者Git放弃本地修改，强制更新后，然后再上传（先手动备份修改内容） git fetch –all git reset –hard origin/master git pull
git fetch 指令是下载远程仓库最新内容，不做合并 git reset 指令把HEAD指向master最新版本，origin/master可替换为要拉取的远程分支名称