Git Pull is Not Possible, Unmerged Files

Question

I\'ve read all of the similar questions on this; it seems that none of the following have worked:

Delete offending files
git reset --hard HEAD
git stash
git          


        

Answer 1

Assuming you want to throw away any changes you have, first check the output of git status. For any file that says "unmerged" next to it, run git add . Then follow up with git reset --hard. That will git rid of any local changes except for untracked files.