git error: The following untracked working tree files would be overwritten by merge 服务器自动更新

错误：

From gitee.com:fn321/cms
 * branch            develop    -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
	employment/controller/Information.php
	employment/model/Information.php
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
	.htaccess
Please move or remove them before you can merge.
Aborting
done 2019-08-21 11:19:57

解决办法：先进入库的文件夹

git add -A
//还原到某个历史 哈希值在git log里有对应的很长一段值的
git reset --hard

参考：

git error: Your local changes to the following files would be overwritten by merge 服务器自动更新_我是高手高手高高手的博客-CSDN博客

git - The following untracked working tree files would be overwritten by merge, but I don't care - Stack Overflow