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

[andy@localhost weixin_robot]$ git pull

Updating d652d1c..fa05549 error: The following untracked working tree files would be overwritten by merge:   

 .idea/encodings.xml   

 Please move or remove them before you can merge. Aborting

[andy@localhost weixin_robot]$ git clean -d -fx

Guess you like

Origin http://43.154.161.224:23101/article/api/json?id=324776371&siteId=291194637