How do I solve a folder capitalization conflict with Git on Windows?
git
Solution
We encountered a similar issue in our git repository on Windows when a large number of files were moved around to different directories.
I fixed our issue the first time manually by cloning the repository to a Linux VM and running a bash script with `git mv` commands to fix the file path case issue. This was a painful process so I decided to develop a utility that automates the process.
Git Unite is a .NET console application I wrote using the libgit2sharp library. The program identifies all git index entries with file path case different from what the Windows file system reports.
I wrote a blog posting detailing the tool, usage, and history behind it at Git Unite - Fix Case Sensitive File Paths on Windows
Problem
I'm doing a `git rebase`, and I'm stuck because in one commit I have a folder named `Proto`, but in the other commit I have a folder named `proto`. It was an honest mistake and should have been `Proto` in both cases. The best I can figure out here is to try deleting the folder from both commits and then trying the rebase again, but there has to be a better way. In the past, when I've run into capitalization problems with a file, I've used git mv, but with the folder it won't let me run git mv, and I don't know why. What's the correct way to fix a folder capitalization problem in git on Windows?