Git pull encountered such a problem:
The following untracked working tree files would be overwritten by merge:.idea/vcs.xml
Solution:
git clean – D – FX
Note: will delete not add to the warehouse file, operation remember careful, lest change the file lost. In essence, it is to operate the untraceable local
$git clean – F – n # 1 in the warehouse
$ git clean -f -n # 1
$ git clean -f # 2
$ git clean -fd # 3
$ git clean -fX # 4
$ git clean -fx # 5
(1): The -n option will show which files will be removed when (2) is executed.
(2): This command will remove all the files shown in command (1).
(3): If you also want to remove file pieces, use the option -d.
(4): If you only want to remove files that have been ignored, use option -X.
(5): If you want to remove both ignored and unignored files, use option -x.