error: Untracked working tree file 'XXXXX' would be overwritten by merge.

error: Untracked working tree file 'XXXXX' would be overwritten by merge.

需要执行下面的命令才能修复:
  1. git reset --hard HEAD
  2. git clean -f -d
  3. git pull

你可能感兴趣的:(error: Untracked working tree file 'XXXXX' would be overwritten by merge.)