我得到这个混帐错误,我真的不明白这是什么意思,也不是我该如何解决:错误做的git拉时,无法解决
(v_env)[[email protected] searchplus]$ git pull origin master
From file:///home/nubela/Workspace/_git/searchplus
* branch master -> FETCH_HEAD
Updating 38f3d5b..fe6028c
error: Untracked working tree file 'searchplus/.project' would be overwritten by merge. Aborting
(v_env)[[email protected] searchplus]$
我已经做了以下但无济于事:
git clean -f -d
git reset --hard HEAD
任何人都可以帮助启发我吗?谢谢:)