How to fix duplicate folders in GIT?

Question

git

In the project, there was a need to rename some folders (make them with a capital letter). Under unknown circumstances, the repository now contains 2 identical folders (example controllers and Controllers).
When you try to do a git pull, the folders are unloaded with a small letter, while on the local machine the directories are with a capital letter. When a file is changed in one of the folders, then the commit shows the change in 2 files at once (in the folder with a capital and a small letter).
The question is how to get rid of this duplication?

Answer 1

I would try deleting the newer one - git rm
And then renaming the old one to the new one - git mv.