Untracked working tree file 'xxx' would be overwritten by merge. Aborting

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

$ git pull...Updating 190f830..8d7e43eerror: Untracked working tree file 'libs/barcode/README_1D.txt' would be overwritten by merge.  Aborting

解决方案:

$ git fetch --all
$ git reset --hard origin/master


你可能感兴趣的:(error,File,master,解决方案,origin)