Unable to change branches, remotely deleted file invisible in local repo

53 Views Asked by At

I've created a branch from master, made a PR. Somewhere along the line two files src/A/A.tsx and src/a/A.tsx made its way into the remote repo before I turned on git's case sensitivity. I removed the src/A/A.tsx file on github repo, because I wanted to only keep src/a/A.tsx. I've made a PR with this branch. Now when I try to make and switch to new branches, this error appears.

"Unable to checkout when changes are present on your branch. The following files would be overwritten src/A/A.tsx You can stash your changes now and recover them afterwards. "

Pressing "Stash Changes and Continue" in github desktop doesn't do anything. I'm not seeing src/A/A.tsx in Finder, nor when git status. How do delete src/A/A.tsx and get back the ability to switch branches?

1

There are 1 best solutions below

1
On BEST ANSWER

After running git config core.ignorecase true I can once again switch branches. Hopefully everything will be fine once I push again.