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.
Similar Posts:
- How to Solve error: failed to push some refs to ‘xxxx’
- Updates were rejected because the remote contains work that you do
- [Solved] error: failed to push some refs to ‘xxxx’
- Git error: The following untracked working tree files would be overwritten by checkout
- SDK location not found. Define location with sdk.dir in the local.properties file or with an AND…
- How to Solve IDEA Error: “Library source does not match the bytecode for class”
- Git Push hint: Updates were rejected because the remote contains work that you do hint: not have …
- MySQL reports an error using load data local infile
- Git LS files displays the current file status