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
習慣沉默2017-05-02 09:22:15
Put that file into gitignore. This kind of file is created by IDE and is useless