git强制覆盖拉取

问题： 直接在服务器上修改代码，执行git pull报错：

remote: Counting objects: 4, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 4 (delta 0), reused 4 (delta 0)
Unpacking objects: 100% (4/4), done.
From 
   4a1d8d8..b0e9d1c  master     -> origin/master
Updating 4a1d8d8..b0e9d1c
error: Your local changes to the following files would be overwritten by merge:
        cron/cron.go
Please, commit your changes or stash them before you can merge.
Aborting

执行强制覆盖拉取（前提是服务器上更新的代码已提交到git上）

git fetch --all
git reset --hard origin/master
git pull