Skip to content

Instantly share code, notes, and snippets.

@jvloo

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

Last active August 28, 2021 16:30
Show Gist options
  • Save jvloo/8a7617673ce38b19e3fe3b2c632cf6ac to your computer and use it in GitHub Desktop.
Save jvloo/8a7617673ce38b19e3fe3b2c632cf6ac to your computer and use it in GitHub Desktop.
Download ZIP
Fix Git error "The following untracked working tree files would be overwritten by merge. Please move or remove them before you merge."
Raw
git-fix-untracked-files-overwritten-by-merge.md
  • 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment