I did a git pull and got an error:
git pull
The following working tree files would be overwritten by merge... Please move or remove them before you
In newer version of git (2.23+) you can use:
git switch -C master origin/master
-C is same as --force-create. Related Reference Docs
-C
--force-create