intellij-idea - github synchronization file name always errors

Question

In java project

I use github to manage my project data, but after some of the class names (file names) are modified, they will be changed back during synchronization (IDEA or github client).
Did I overlook some files?

This is the ignore list in IDEA

Obviously the class name (file name) is already the right one, but the refresh in version control still has the old name

The above situation will cause the class name (file name) to be modified back to the old one every time I synchronize it on another computer.

Answer 1

It’s a bug. You need to back up the file first, then use git rm to delete it. After committing it once, add the file back and commit it again.

Answer 2

Windows and OS X are not case-sensitive in file names, but git itself is.

You can use git mv to change your name:

git mv -f file File

will come from file改成File.

---

Also, if your operating system is case-sensitive in file names, you can look at a setting in the configuration core.ignoreCase（参考git-config）是不是默认值（false):

git config core.ignorecase

If the return value is not empty or false的话，把它设置成false.

git config core.ignorecase false