jvloo/git-fix-untracked-files-overwritten-by-merge.md

Last active August 28, 2021 16:30

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/jvloo/8a7617673ce38b19e3fe3b2c632cf6ac.js"></script>
Save jvloo/8a7617673ce38b19e3fe3b2c632cf6ac to your computer and use it in GitHub Desktop.

Fix Git error "The following untracked working tree files would be overwritten by merge. Please move or remove them before you merge."

Raw

Track all files, remove all of the local changes to those files, and then get the files from the remote origin.

git add * 
git stash
git pull

Select an option