How to recover from git “added by us” conflict after applying stash after renaming

Question

I don\'t recall how my git local repo got into this state, but here is the situation:

My status on the command line says "nothing to commit, working tree clean"

Answer 1

You might come back to the version where you stashed from, stash pop, rename the file, then stash save again, then junp back to the revision you are currently working on and stash pop. Then rename should not be an issue