* branch master -> FETCH_HEAD
3fd33e5..317aa74 master -> origin/master
Updating 3fd33e5..317aa74
error: Your local changes to the following files would be overwritten by merge:
IMSUR/settings.py
login/templates/login.html
login/views.py
Please commit your changes or stash them before you merge.
Aborting
当git pull从远程数据库拉取代码时,出现如上错误。
错误表明本地的代码,与远程的出现了不一致。
强制性的覆盖本地代码
git reset --hard
git pull origin master
- 命令解释:
- 回退到上一个版本
- 拉取代码