- Error: The following untracked working tree files would be overwritten by merge. Please move or remove them before you merge. - Solution: Track all files, remove all of the local changes to those files, and then get the files from the remote origin. (https://stackoverflow.com/a/26639255/11690179) ``` git add * git stash git pull ```