The following untracked working tree files would be overwritten by merge, but I don't care
The problem is that you are not tracking the files locally but identical files are tracked remotely so in order to "pull" your system would be forced to overwrite the local files which are not version controlled.
Try running
git add *
git stash
git pull
This will track all files, remove all of your local changes to those files, and then get the files from the server.
You can try command to clear the untracked files from the local
Git 2.11 and newer versions:
git clean -d -f .
Older versions of Git:
git clean -d -f ""
Where -d
can be replaced with the following:
-x
ignored files are also removed as well as files unknown to Git.-d
remove untracked directories in addition to untracked files.-f
is required to force it to run.
Here is the link that can be helpful as well.
The only commands that worked for me were:
git fetch --all
git reset --hard origin/{{your branch name}}