git 提交出错

Question

From https://git.coding.net/changelink/fancheng
* branch master -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
.project
Please move or remove them before you can merge.
Aborting

Answer 1

把那个文件放到gitignore吧，这种文件是ide搞出来的，没用

Answer 2

删掉这个文件，或者重命名，然后再 pull 或者 fetch。