Your local changes to the following files would be overwritten by merge:

在服务器改动之后，用sourcetree提交会产生冲突，解决办法：

git reset --hard 
git pull origin master