I somehow cause git to get all confused after renaming a directory in a Java project. There are now a whole bunch of phantom files sitting in my working copy for the old file name that I can't seem to remove.
An example of one these changes is:
Example Diff: NumberUtils.java
Its basically just committing the location change. But every time I try to commit this change, git (and source tree) just ignores it and they remain as uncommitted modifications
I've tried all the various git suggestions around StackOverflow:
git reset --head head
git clean -rf
None of them seem to work.
Even resetting to previous commit before this refactor, doing it properly and then merging back won't work because this file corruption is preventing a merge.
I even tried a 'scored earth' approach as well where I just cloned a new local copy of the repo. The second I made my first commit, this noise re-appeared.