Git常见问题汇总
——————————————————————————————
命令：git pull --rebase
error: cannot pull with rebase: You have unstaged changes.
error: please commit or stash them.
原因：有未上传的改动
解决方法：git rset --hard重置hard
——————————————————————————————
命令：git push origin master
To https://github.com/LIANFANGTI/YUNKU.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/LIANFANGTI/YUNKU.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
原因：github中的README.md文件不在本地代码目录中
方法：git pull --rebase origin master合并代码
