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

在项目里我们一般都会把自己第一次提交的配置文件忽略本地跟踪 1 ...