error: Untracked working tree file ‘image/image-copy/.gitignore’ would be overwritten by merge. Aborting
解决方案
$ git fetch --all
$ git reset --hard origin/master
error: Untracked working tree file ‘image/image-copy/.gitignore’ would be overwritten by merge. Aborting
解决方案
$ git fetch --all
$ git reset --hard origin/master