Git pull error: Your local changes to the following files would be overwritten by merge: May 16, 2023 by Tarik Delete the problematic files. Run git reset --hard. That should fix it.