error: The following untracked working tree files would be overwritten by merge:

error: The following untracked working tree files would be overwritten by merge:_第1张图片

 

解放办法:
手动删除上面的文件
[注意打开git bash,不要使用idea]
,然后执行  $ git pull origin develop

结果成功
error: The following untracked working tree files would be overwritten by merge:_第2张图片

 

你可能感兴趣的:(git)