So, I installed Moodle using Moosh/git. Now when I got to perform a git pull, I get:
error: Your local changes to the following files would be overwritten by merge:
And then a thousand files/folders are listed in everything from admin/environment to course/* and enrol/* to reportuilder/upgrade.txt... files/folders I've not touched in any way (at least that I'm aware of... it's a pretty stock moodle install with levelUp, VPL, boost_union and mod_checklist).
I've tried git reset -- hard then git pull with no success. Any other suggestions?