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

标签：files overwritten working would xxx merge location untracked

错误内容如下：

1. error: The following untracked working tree files would be overwritten by merge:
2.   xxx/xxx/xxx/xxx/xxx/xxx/xxx.java
3.   Please move or remove them before you can merg             git clean -d -fx  删除没有被上传的文件

TRANSLATE with x English

Arabic	Hebrew	Polish
Bulgarian	Hindi	Portuguese
Catalan	Hmong Daw	Romanian
Chinese Simplified	Hungarian	Russian
Chinese Traditional	Indonesian	Slovak
Czech	Italian	Slovenian
Danish	Japanese	Spanish
Dutch	Klingon	Swedish
English	Korean	Thai
Estonian	Latvian	Turkish
Finnish	Lithuanian	Ukrainian
French	Malay	Urdu
German	Maltese	Vietnamese
Greek	Norwegian	Welsh
Haitian Creole	Persian

  TRANSLATE with COPY THE URL BELOW Back EMBED THE SNIPPET BELOW IN YOUR SITE Enable collaborative features and customize widget: Bing Webmaster Portal Back

标签：files,overwritten,working,would,xxx,merge,location,untracked
From： https://www.cnblogs.com/Lonelychampion/p/17678139.html