git pll and notice: untracked working tree files would be overwritten by merge

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

git fetch downloads the latest from remote without trying to merge or rebase anything. 

Then thegit reset resets the master branch to what you just fetched.