I just went into a project (Wordpress theme) to pull some changes that I had committed. But it won't pull as someone has been making direct edits to the files and not using git.
What is the best way to deal with this? If I do a hard reset then the untracked changes will be lost. I could pull all the theme files down, put them in git and then re-apply my changes and pull it down again but it seems a long winded way of doing it. Is there a better solution?